-
<%= l(:field_subject) %>
<%= l(:field_subject) %> *
diff --git a/app/views/users/_my_joinedcourse.html.erb b/app/views/users/_my_joinedcourse.html.erb
index 484380778..315204e7a 100644
--- a/app/views/users/_my_joinedcourse.html.erb
+++ b/app/views/users/_my_joinedcourse.html.erb
@@ -13,7 +13,7 @@
<% else %>
+
<%= debug(params) if Rails.env.development? %>
From e1d9d6ab45dabfe78c7997b22ba4d8802736812d Mon Sep 17 00:00:00 2001
From: yanxd
Date: Tue, 1 Jul 2014 16:01:42 +0800
Subject: [PATCH 20/24] =?UTF-8?q?tag=E6=9F=A5=E8=AF=A2=E5=B4=A9=E6=BA=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/tags_controller.rb | 16 ++++++++--------
...140701075839_add_tag_type_index_to_tagging.rb | 5 +++++
2 files changed, 13 insertions(+), 8 deletions(-)
create mode 100644 db/migrate/20140701075839_add_tag_type_index_to_tagging.rb
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 4c0d91884..0216d529d 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -256,14 +256,14 @@ class TagsController < ApplicationController
# 获取有某类对象的tag总数
def get_tags_size
- @issues_tags_num = Issue.tag_counts.size
- @projects_tags_num = Project.tag_counts.size
- @users_tags_num = User.tag_counts.size
- @bids_tags_num = Bid.tag_counts.size
- forum_tags_num = Forum.tag_counts.size
- attachment_tags_num = Attachment.tag_counts.size
- @open_source_projects_num = OpenSourceProject.tag_counts.size
- @contests_tags_num = Contest.tag_counts.size
+ @issues_tags_num = ActsAsTaggableOn::Tagging.where(taggable_type:"Issue").count
+ @projects_tags_num = ActsAsTaggableOn::Tagging.where(taggable_type:"Project").count
+ @users_tags_num = ActsAsTaggableOn::Tagging.where(taggable_type:"User").count
+ @bids_tags_num = ActsAsTaggableOn::Tagging.where(taggable_type:"Bid").count
+ forum_tags_num = ActsAsTaggableOn::Tagging.where(taggable_type:"Forum").count
+ attachment_tags_num = ActsAsTaggableOn::Tagging.where(taggable_type:"Attachment").count
+ @open_source_projects_num = ActsAsTaggableOn::Tagging.where(taggable_type:"OpenSourceProject").count
+ @contests_tags_num = ActsAsTaggableOn::Tagging.where(taggable_type:"Contest").count
return @users_tags_num,@projects_tags_num,@issues_tags_num,@bids_tags_num, forum_tags_num, attachment_tags_num, @contests_tags_num, @open_source_projects_num
end
diff --git a/db/migrate/20140701075839_add_tag_type_index_to_tagging.rb b/db/migrate/20140701075839_add_tag_type_index_to_tagging.rb
new file mode 100644
index 000000000..11a5b4ef9
--- /dev/null
+++ b/db/migrate/20140701075839_add_tag_type_index_to_tagging.rb
@@ -0,0 +1,5 @@
+class AddTagTypeIndexToTagging < ActiveRecord::Migration
+ def change
+ add_index :taggings, :taggable_type
+ end
+end
From 2b855badf9ae15ea9b5e8c07987d2f5bf662dd19 Mon Sep 17 00:00:00 2001
From: nwb
Date: Wed, 2 Jul 2014 09:11:45 +0800
Subject: [PATCH 21/24] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=AF=BE=E7=A8=8B?=
=?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E5=85=B3=E8=81=94=E5=B7=B2=E6=9C=89?=
=?UTF-8?q?=E8=B5=84=E6=BA=90=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/attachments_controller.rb | 29 +++++++++++++++++++
.../add_exist_file_to_course.js.erb | 17 +++++++++++
app/views/files/_course_file.html.erb | 2 +-
config/routes.rb | 1 +
4 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644 app/views/attachments/add_exist_file_to_course.js.erb
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 5dbb4f2bb..af96d9c68 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -197,6 +197,35 @@ class AttachmentsController < ApplicationController
end
end
+ def add_exist_file_to_course
+ class_id = params[:class_id]
+ attachments = params[:attachment][:attach]
+
+ obj = Course.find_by_id(class_id)
+ attachments.collect do |attach_id|
+ ori = Attachment.find_by_id(attach_id)
+ next if ori.blank?
+ attach_copied_obj = ori.copy
+ attach_copied_obj.tag_list.add(ori.tag_list) # tag关联
+ attach_copied_obj.container = obj
+ attach_copied_obj.created_on = Time.now
+ attach_copied_obj.author_id = User.current.id
+ @obj = obj
+ @save_flag = attach_copied_obj.save
+ @save_message = attach_copied_obj.errors.full_messages
+ end
+
+ respond_to do |format|
+ format.js
+ end
+ rescue NoMethodError
+ @save_flag = false
+ @save_message = [] << l(:error_attachment_empty)
+ respond_to do |format|
+ format.js
+ end
+ end
+
private
def find_project
@attachment = Attachment.find(params[:id])
diff --git a/app/views/attachments/add_exist_file_to_course.js.erb b/app/views/attachments/add_exist_file_to_course.js.erb
new file mode 100644
index 000000000..58e5690ef
--- /dev/null
+++ b/app/views/attachments/add_exist_file_to_course.js.erb
@@ -0,0 +1,17 @@
+<% if @save_flag %>
+ window.location.reload();
+<% else %>
+ // alert('添加文件失败:\n<%=@save_message[0]%>');
+ $('#ajax-modal').html('添加文件失败 <%=@save_message.join(', ')%>');
+
+ var el = $('#ajax-modal').first();
+ var title = el.find('h3.title').text();
+ el.dialog({
+ width: '200px',
+ modal: true,
+ resizable: false,
+ dialogClass: 'modal',
+ title: title
+ });
+
+<% end %>
diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb
index c6f872d61..d9913539f 100644
--- a/app/views/files/_course_file.html.erb
+++ b/app/views/files/_course_file.html.erb
@@ -40,7 +40,7 @@
<%= text_field_tag(:attach_search) %>
<%#= submit_tag("Search") %>
<% end -%>
- <%= form_tag attach_relation_path(:format => 'js'),
+ <%= form_tag course_attach_relation_path(:format => 'js'),
method: :post,
remote: true,
id: "relation_file_form",
diff --git a/config/routes.rb b/config/routes.rb
index ad493bce8..2e11d9b43 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -510,6 +510,7 @@ RedmineApp::Application.routes.draw do
get 'attachments/autocomplete'
match 'attachments/autocomplete', :to => 'attachments#autocomplete', via: [:post]
post 'attachments/relationfile', to: 'attachments#add_exist_file_to_project', as: 'attach_relation'
+ post 'attachments/courserelationfile', to: 'attachments#add_exist_file_to_course', as: 'course_attach_relation'
get 'attachments/renderTag/:attchmentId', :to => 'attachments#renderTag', :attchmentId => /\d+/
resources :attachments, :only => [:show, :destroy] do
collection do
From 54a2fb8a9cfcde34beb0b40dee07da02ae9af1b6 Mon Sep 17 00:00:00 2001
From: z9hang
Date: Wed, 2 Jul 2014 11:32:49 +0800
Subject: [PATCH 22/24] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E5=BE=97=E5=88=86=E4=B8=8E=E9=A1=B9=E7=9B=AE=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=E5=BE=97=E5=88=86=E4=BF=9D=E6=8C=81?=
=?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/helpers/welcome_helper.rb | 1 +
app/views/welcome/index.html.erb | 28 +++++++++++++++++++++++++++-
config/locales/zh.yml | 1 +
3 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb
index 35fd6ee08..048933e40 100644
--- a/app/helpers/welcome_helper.rb
+++ b/app/helpers/welcome_helper.rb
@@ -235,6 +235,7 @@ module WelcomeHelper
def show_grade project
grade = 0
begin
+ #ActiveRecord::Base.connection.execute("CALL sp_project_status_cursor();")#执行存储过程速度慢
grade = project.project_status.grade if project && project.project_status
rescue Exception => e
logger.error "Logger.Error [WelcomeHelper] ===> #{e}"
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 16a4cbf21..345f47739 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -68,7 +68,33 @@
><%=project.description.truncate(50, omission: '...')%>
- <%= content_tag "span", show_grade(project),
+ <% issue_count = project.issues.count %>
+ <% issue_journal_count = project.issue_changes.count %>
+ <% issue_score = issue_count * 0.2 %>
+ <% issue_journal_score = issue_journal_count * 0.1 %>
+ <% finall_issue_score = issue_score + issue_journal_score %>
+
+ <% new_count = project.news.count %>
+ <% new_score = new_count * 0.1 %>
+ <% finall_new_score = new_score %>
+
+ <% document_count = project.documents.count %>
+ <% file_score = document_count * 0.1 %>
+ <% finall_file_score = file_score %>
+
+ <% changeset_count = project.changesets.count %>
+ <% code_submit_score = changeset_count * 0.3 %>
+ <% finall_code_submit_score = code_submit_score %>
+
+ <% board_message_count = 0 %>
+ <% project.boards.each do |board| %>
+ <% board_message_count += board.messages_count %>
+ <% end %>
+ <% topic_score = board_message_count * 0.1 %>
+ <% finall_topic_score = topic_score %>
+
+ <% finall_project_score = finall_issue_score + finall_new_score + finall_file_score + finall_code_submit_score + topic_score %>
+ <%= content_tag "span", l(:label_project_score)+ ":" + format("%.2f" , finall_project_score ),
:style => "cursor: pointer; display: inline-block; float: right; color: #ec6300; ",
:title => "项目得分，综合考虑了项目的各项活动，反映了该项目的活跃程度",
:class => "tooltip",
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index eacd5ac41..9b622531a 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -500,6 +500,7 @@ zh:
label_project_new: 新建项目
label_project_new_description: '项目可以是软件开发项目，也可以是协作研究项目。'
label_project_plural: 项目列表
+ label_project_score: 项目评分
label_x_projects:
zero: 无项目
one: 1 个项目
From e8705bccb1cb6490c22905e8593060999220cf9d Mon Sep 17 00:00:00 2001
From: nwb
Date: Wed, 2 Jul 2014 14:58:52 +0800
Subject: [PATCH 23/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?=
=?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/attachments_controller.rb | 8 +-
app/helpers/attachments_helper.rb | 39 ++++++++-
app/models/attachment.rb | 100 ++++++++++++++++++++++
app/views/attachments/autocomplete.js.erb | 5 ++
app/views/files/_new.html.erb | 25 ++++--
public/stylesheets/application.css | 2 +-
public/stylesheets/nyan.css | 10 +++
7 files changed, 175 insertions(+), 14 deletions(-)
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index af96d9c68..c234eb17b 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -161,7 +161,13 @@ class AttachmentsController < ApplicationController
end
def autocomplete
- @project = Project.find_by_id(params[:project_id])
+ # modify by nwb
+ if params[:project_id]
+ @project = Project.find_by_id(params[:project_id])
+ elsif params[:course_id]
+ @course = Course.find_by_id(params[:course_id])
+ end
+
respond_to do |format|
format.js
end
diff --git a/app/helpers/attachments_helper.rb b/app/helpers/attachments_helper.rb
index aa6a5f7f5..3e61b2a44 100644
--- a/app/helpers/attachments_helper.rb
+++ b/app/helpers/attachments_helper.rb
@@ -115,7 +115,7 @@ module AttachmentsHelper
s = content_tag('div', attachments_check_box_tags('attachment[attach][]', searched_attach), :id => 'attachments')
links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false) {|text, parameters, options|
- link_to text, attachments_autocomplete_path( parameters.merge(:q => params[:q], :format => 'js')), :remote => true }
+ link_to text, attachments_autocomplete_path( parameters.merge(:project_id=>project.id,:q => params[:q], :format => 'js')), :remote => true }
return s + content_tag('div', content_tag('ul', links), :class => 'pagination')
@@ -133,6 +133,35 @@ module AttachmentsHelper
# return searched_attach.to_json
end
+ # add by nwb
+ def render_attachments_for_new_course(course, limit=nil)
+ # 查询条件
+ params[:q] ||= ""
+ filename_condition = params[:q].strip
+
+ attachAll = Attachment.scoped
+
+ # 除去当前课程的所有资源
+ nobelong_attach = Attachment.where("!(container_type = '#{course.class}' and container_id = #{course.id})") unless course.blank?
+
+ # 搜索域确定
+ domain = course.nil? ? attachAll : nobelong_attach
+
+ # 搜索到的资源
+ searched_attach = domain.where("filename LIKE :like ", like:"%#{filename_condition}%").limit(limit).order('created_on desc')
+ searched_attach = private_filter searched_attach
+ searched_attach = paginateHelper(searched_attach, 10)
+
+ #testattach = Attachment.public_attachments
+
+ s = content_tag('div', attachments_check_box_tags('attachment[attach][]', searched_attach), :id => 'attachments')
+ links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false) {|text, parameters, options|
+ link_to text, attachments_autocomplete_path( parameters.merge(:course_id=>course.id,:q => params[:q], :format => 'js')), :remote => true }
+
+ return s + content_tag('div', content_tag('ul', links), :class => 'pagination')
+
+ end
+
def attachments_check_box_tags(name, attachs)
s = ''
attachs.each do |attach|
@@ -144,18 +173,22 @@ module AttachmentsHelper
def private_filter resultSet
result = resultSet.to_a.dup
+ # modify by nwb
+ #添加对课程资源文件的判断
resultSet.map { |res|
if(res.container.nil? ||
(res.container.class.to_s=="Project" && res.container.is_public == false) ||
- (res.container.has_attribute?(:project) && res.container.project.is_public == false) ||
+ (res.container.has_attribute?(:project) && res.container.project && res.container.project.is_public == false) ||
(res.container.class.to_s=="HomeworkAttach" && res.container.bid.reward_type == 3) ||
- false
+ (res.container.class.to_s=="Course" && res.container.is_public == false) ||
+ (res.container.has_attribute?(:course) && res.container.course && res.container.course.is_public == false)
)
result.delete(res)
end
}
result
end
+
include Redmine::Pagination
def paginateHelper obj, pre_size=10
@obj_count = obj.count
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 53b2e9871..116e2de9a 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -68,6 +68,106 @@ class Attachment < ActiveRecord::Base
before_save :be_user_score # user_score
after_destroy :delete_from_disk
+ # add by nwb
+ # 获取所有可公开的资源文件列表
+ scope :public_attachments, lambda {
+ #joins(Project.table_name).where("container_type = 'Project' and ")
+ joins("LEFT JOIN #{Project.table_name} ON #{Attachment.table_name}.container_type='Project' AND #{Project.table_name}.id = #{Attachment.table_name}.container_id and #{Project.table_name}.is_public=1 " +
+ " LEFT JOIN #{Document.table_name} ON #{Attachment.table_name}.container_type='Project' AND #{Document.table_name}.project_id in "+self.public_project_id +
+ " LEFT JOIN #{Issue.table_name} ON #{Attachment.table_name}.container_type='Project' AND #{Issue.table_name}.project_id in "+self.public_project_id +
+ " LEFT JOIN #{Version.table_name} ON #{Attachment.table_name}.container_type='Project' AND #{Version.table_name}.project_id in "+self.public_project_id +
+ " LEFT JOIN #{WikiPage.table_name} ON #{Attachment.table_name}.container_type='WikiPage' AND #{WikiPage.table_name}.parent_id in "+self.public_wiki_id +
+ " LEFT JOIN #{Message.table_name} ON #{Attachment.table_name}.container_type='Message' AND #{Message.table_name}.parent_id in "+self.public_board_id +
+ " LEFT JOIN #{Course.table_name} ON #{Attachment.table_name}.container_type='Course' AND #{Course.table_name}.is_public=1 " +
+ " LEFT JOIN #{News.table_name} ON #{Attachment.table_name}.container_type='News' AND (#{News.table_name}.project_id in "+self.public_project_id + " OR #{News.table_name}.course_id in " + self.public_course_id + ")" +
+ " LEFT JOIN #{HomeworkAttach.table_name} ON #{Attachment.table_name}.container_type='HomeworkAttach' AND #{HomeworkAttach.table_name}.bid_id in "+self.public_bid_id)
+ }
+
+ # add by nwb
+ # 公开的项目id列表
+ def self.public_project_id
+ idlist = "("
+ projects=Project.all_public
+ count = projects.count
+ for i in 0...count
+ project = projects[i]
+ idlist+="'" + project.id.to_s + "'"
+ if i != count-1
+ idlist+=","
+ end
+ end
+ idlist += ")"
+ idlist
+ end
+
+ # add by nwb
+ # 公开的课程id列表
+ def self.public_course_id
+ idlist = "("
+ courses=Course.all_public
+ count = courses.count
+ for i in 0...count
+ course = courses[i]
+ idlist+="'" + course.id.to_s + "'"
+ if i != count-1
+ idlist = idlist + ","
+ end
+ end
+ idlist += ")"
+ idlist
+ end
+
+ # add by nwb
+ # 公开的wiki id列表
+ def self.public_wiki_id
+ idlist = "("
+ wikis=Wiki.where("project_id in " + public_project_id)
+ count = wikis.count
+ for i in 0...count
+ wiki = wikis[i]
+ idlist+="'" + wiki.id.to_s + "'"
+ if i != count-1
+ idlist = idlist + ","
+ end
+ end
+ idlist += ")"
+ idlist
+ end
+
+ # add by nwb
+ # 公开的board id列表
+ def self.public_board_id
+ idlist = "("
+ boards=Board.where("project_id in " + public_project_id + " or course_id in " + public_course_id)
+ count = boards.count
+ for i in 0...count
+ board = boards[i]
+ idlist+="'" + board.id.to_s + "'"
+ if i != count-1
+ idlist = idlist + ","
+ end
+ end
+ idlist += ")"
+ idlist
+ end
+
+ # add by nwb
+ # 公开的bid id列表
+ def self.public_bid_id
+ idlist = "("
+ bids=Bid.where("reward_type=3")
+ count = bids.count
+ for i in 0...count
+ bid = bids[i]
+ idlist+="'" + bid.id.to_s + "'"
+ if i != count-1
+ idlist = idlist + ","
+ end
+ end
+ idlist += ")"
+ idlist
+ end
+
# Returns an unsaved copy of the attachment
def copy(attributes=nil)
copy = self.class.new
diff --git a/app/views/attachments/autocomplete.js.erb b/app/views/attachments/autocomplete.js.erb
index 784128ea1..404ad9a61 100644
--- a/app/views/attachments/autocomplete.js.erb
+++ b/app/views/attachments/autocomplete.js.erb
@@ -1,2 +1,7 @@
$('#relation_file_form').show();
+<% if @project%>
$('#relation_file').html('<%=render_attachments_for_new_project(@project, nil)%>');
+<% elsif @course%>
+$('#relation_file').html('<%=render_attachments_for_new_course(@course, nil)%>');
+<% end%>
+
diff --git a/app/views/files/_new.html.erb b/app/views/files/_new.html.erb
index af65bbcf4..bd66d93be 100644
--- a/app/views/files/_new.html.erb
+++ b/app/views/files/_new.html.erb
@@ -13,18 +13,25 @@
<%= select_tag "version_id", content_tag('option', '') +
options_from_collection_for_select(versions, "id", "name"), {style: 'width:100px'} %>
+ <% if attachmenttypes.any? %>
+ <%= l(:attachment_type) %>
+
+ <%= select_tag "attachment_type",
+ options_from_collection_for_select(attachmenttypes, "id",
+ "typeName", 2), {style: 'width:100px'} %>
+
+ <% end %>
<% else %>
-
+ <% if attachmenttypes.any? %>
+ <%= l(:attachment_type) %>
+ <%= select_tag "attachment_type",
+ options_from_collection_for_select(attachmenttypes, "id",
+ "typeName", 2), {style: 'width:100px'} %>
+ <% end %>
+
<% end %>
- <% if attachmenttypes.any? %>
- <%= l(:attachment_type) %>
-
- <%= select_tag "attachment_type",
- options_from_collection_for_select(attachmenttypes, "id",
- "typeName", 2), {style: 'width:100px'} %>
-
- <% end %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 1a690a4cd..89ee39ada 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1853,7 +1853,7 @@ a.remove-upload:hover {text-decoration:none !important;}
/*gcm upload file count and deleteall*/
#upload_file_count #count {color:red; font-size:1.5em;}
-span.add_attachment .remove_all {background:none;background: url(../images/delete.png) no-repeat 1px 50%; width:1px; display:inline-block;position:absolute;right:10%;text-decoration:none;}
+span.add_attachment .remove_all {background:none;background: url(../images/delete.png) no-repeat 1px 50%; width:1px; display:inline-block;right:10%;text-decoration:none;}
div.fileover { background-color: lavender; }
diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css
index b041f43a1..30496a061 100644
--- a/public/stylesheets/nyan.css
+++ b/public/stylesheets/nyan.css
@@ -1071,6 +1071,16 @@ div.tags_area {
border-bottom: 1px solid #c8d4fd;
}
+#ver-zebra #vzebra-attachmenttype, #ver-zebra #vzebra-children {
+ background: #ffffff;
+ border-bottom: 1px solid #c8d4fd;
+}
+
+#ver-zebra #vzebra-contenttype, #ver-zebra #vzebra-children {
+ background: #ffffff;
+ border-bottom: 1px solid #c8d4fd;
+}
+
#ver-zebra #vzebra-comedy, #ver-zebra #vzebra-action {
background: #ffffff;
border-bottom: 1px solid #d6dfff;
From 6f5d6c382b9258cc459391336d9e5bd72358cc32 Mon Sep 17 00:00:00 2001
From: z9hang
Date: Wed, 2 Jul 2014 17:06:34 +0800
Subject: [PATCH 24/24] =?UTF-8?q?=E7=BB=99=E7=94=A8=E6=88=B7=E7=95=99?=
=?UTF-8?q?=E8=A8=80=E7=9A=84=E5=9B=9E=E5=A4=8D=E8=8B=A5=E4=B8=BA=E6=9F=A5?=
=?UTF-8?q?=E7=9C=8B=E8=AE=A1=E5=85=A5=E6=96=B0=E7=95=99=E8=A8=80=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/users_controller.rb | 6 +++++-
app/controllers/words_controller.rb | 3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f78112c21..144e86f4f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -52,6 +52,7 @@ class UsersController < ApplicationController
helper :custom_fields
include CustomFieldsHelper
include AvatarHelper
+ include WordsHelper
# added by liuping 关注
@@ -235,7 +236,10 @@ class UsersController < ApplicationController
def user_newfeedback
@jours = @user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
@jours.update_all(:is_readed => true, :status => false)
-
+ @jours.each do |journal|
+ fetch_user_leaveWord_reply(journal).update_all(:is_readed => true, :status => false)
+ end
+
@limit = 10
@feedback_count = @jours.count
@feedback_pages = Paginator.new @feedback_count, @limit, params['page']
diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index 52a7f585a..a4f53c100 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -56,7 +56,8 @@ class WordsController < ApplicationController
reply_user_id = params[:reference_user_id]
reply_id = params[:reference_message_id] # 暂时不实现
content = params[:user_notes]
- options = {:user_id => author_id,
+ options = {:user_id => author_id,
+ :status => true,
:m_parent_id => parent_id,
:m_reply_id => reply_id,
:reply_id => reply_user_id,