+
+
+ 匿评开启时间：<%= activity.homework_detail_manual.evaluation_start%> 00:00
+
+
+ 匿评关闭时间：<%= activity.homework_detail_manual.evaluation_end%> 23:59
+
+
<%= render :partial => 'student_work/work_attachments', :locals => {:attachments => activity.attachments} %>
- <% if activity.homework_type == 3 && !activity.student_work_projects.empty? && activity.homework_detail_group.base_on_project == 1 %>
+ <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %>
+ <% projects = activity.student_work_projects.where("is_leader = 1") %>
-
- 已关联项目：
+ 已关联项目：<%='各小组尚未将小组项目关联到本次作业。' if projects.empty? %>
- <% activity.student_work_projects.where("is_leader = 1").each do |pro| %>
+ <% projects.each do |pro| %>
<% project = Project.find pro.project_id %>
-
");
+$('#ajax-modal').parent().css("top","").css("left","");
+$('#ajax-modal').parent().addClass("popbox_polls");
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 81b20a67e..03424bd5a 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1969,9 +1969,11 @@ zh:
label_my_score: 我的评分
field_open_anonymous_evaluation: 是否使用匿评
label_course_empty_select: 尚未选择课程！
+ label_resource_subfield_empty_select: 尚未选择资源栏目！
label_project_empty_select: 尚未选择项目！
label_course_prompt: 课程：
label_project_prompt: 项目：
+ label_resource_subfield_prompt: 资源栏目：
label_contain_resource: 已包含资源：
label_quote_resource_failed: ",此资源引用失败! "
label_file_lost: 以下无法成功下载，请联系相关人员重新上传：
diff --git a/config/routes.rb b/config/routes.rb
index 6dce046de..e68169824 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -81,7 +81,7 @@ RedmineApp::Application.routes.draw do
match "subfield_upload_file", :via => :post
end
member do
- match "quote_resource_show", :via => [:get]
+ match "quote_resource_show_org_subfield", :via => [:get]
end
end
end
@@ -807,6 +807,7 @@ RedmineApp::Application.routes.draw do
post 'attachments/relationfiles', to: 'attachments#add_exist_file_to_projects', as: 'attach_relations'
post 'attachments/courserelationfile', to: 'attachments#add_exist_file_to_course', as: 'course_attach_relation'
post 'attachments/courserelationfiles', to: 'attachments#add_exist_file_to_courses', as: 'course_attach_relations'
+ match 'attachments/add_exist_file_to_org_subfield'
get 'attachments/renderTag/:attchmentId', :to => 'attachments#renderTag', :attchmentId => /\d+/
resources :attachments, :only => [:show, :destroy] do
collection do
From fc63dfcb7bde22f6d8d01c976aa2e695c6939800 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Thu, 17 Dec 2015 15:14:52 +0800
Subject: [PATCH 055/120] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/at_controller.rb | 8 +-
app/controllers/boards_controller.rb | 5 +
app/controllers/homework_common_controller.rb | 8 ++
app/controllers/issues_controller.rb | 8 ++
app/helpers/users_helper.rb | 3 +-
app/models/at_message.rb | 100 ++++++++++++++++++
app/models/journal.rb | 13 ++-
app/models/journals_for_message.rb | 10 +-
app/models/message.rb | 15 ++-
app/models/user.rb | 1 +
app/views/boards/_course_show.html.erb | 2 +-
app/views/boards/_project_show.html.erb | 6 +-
app/views/boards/show.html.erb | 6 +-
app/views/users/_user_at_message.html.erb | 16 +--
.../20151216025539_create_at_messages.rb | 15 +++
...20151216030610_add_sender_to_at_message.rb | 5 +
spec/factories/at_messages.rb | 12 +++
spec/models/at_message_spec.rb | 5 +
18 files changed, 218 insertions(+), 20 deletions(-)
create mode 100644 app/models/at_message.rb
create mode 100644 db/migrate/20151216025539_create_at_messages.rb
create mode 100644 db/migrate/20151216030610_add_sender_to_at_message.rb
create mode 100644 spec/factories/at_messages.rb
create mode 100644 spec/models/at_message_spec.rb
diff --git a/app/controllers/at_controller.rb b/app/controllers/at_controller.rb
index 5664201f3..8c551d0df 100644
--- a/app/controllers/at_controller.rb
+++ b/app/controllers/at_controller.rb
@@ -28,11 +28,17 @@ class AtController < ApplicationController
find_message(id)
when 'HomeworkCommon'
find_homework(id)
+ when 'Topic'
+ find_topic(id)
else
nil
end
end
+ def find_topic(id)
+
+ end
+
def find_issue(id)
#1. issues list persons
#2. project persons
@@ -98,7 +104,7 @@ class AtController < ApplicationController
def find_message(id)
message = Message.find(id)
at_persons = message.board.messages.map(&:author)
-
+ (at_persons || []) + (find_project(message.board.project_id)||[])
end
#News
diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index 2ec3cac0d..22c0d5317 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -79,6 +79,11 @@ class BoardsController < ApplicationController
end
end
end
+
+ @project.boards.messages.each do |m|
+ User.current.at_messages.unviewed('Message', m.id).each {|x| x.viewed!}
+ end
+
elsif @course
query_course_messages = @board.messages
query_course_messages.each do |query_course_message|
diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index a8d6dfe8f..b42868ce1 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -19,6 +19,14 @@ class HomeworkCommonController < ApplicationController
@is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
@is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
@is_new = params[:is_new]
+
+ #设置at已读
+ @homeworks.each do |homework|
+ homework.journals_for_messages.each do |j|
+ User.current.at_messages.unviewed('JournalsForMessage', j.id).each {|x| x.viewed!}
+ end
+ end
+
respond_to do |format|
format.js
format.html
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 6f441c29a..44fc7dcba 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -115,6 +115,14 @@ class IssuesController < ApplicationController
# 当前用户查看指派给他的缺陷消息，则设置消息为已读
query = ForgeMessage.where("forge_message_type =? and user_id =? and forge_message_id =?", "Issue", User.current, @issue).first
query.update_attribute(:viewed, true) unless query.nil?
+
+ # issue 新建的at消息
+ User.current.at_messages.unviewed('Issue', @issue.id).each {|x| x.viewed!}
+ # 回复的at消息
+ @issue.journals.each do |j|
+ User.current.at_messages.unviewed('Journal', j.id).each {|x| x.viewed!}
+ end
+
# 缺陷状态更新
query_journals = @issue.journals
query_journals.each do |query_journal|
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 2935d018a..963284f7f 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -89,7 +89,8 @@ module UsersHelper
forge_count = ForgeMessage.where("user_id =? and viewed =?", user, 0).count
user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =?", user, 0).count
user_memo_count = MemoMessage.where("user_id =? and viewed =?", user, 0).count
- messages_count = course_count + forge_count + user_feedback_count + user_memo_count
+ at_count = user.at_messages.where(viewed: false).count
+ messages_count = course_count + forge_count + user_feedback_count + user_memo_count + at_count
end
def user_mail_notification_options(user)
diff --git a/app/models/at_message.rb b/app/models/at_message.rb
new file mode 100644
index 000000000..1a75c4aae
--- /dev/null
+++ b/app/models/at_message.rb
@@ -0,0 +1,100 @@
+class AtMessage < ActiveRecord::Base
+ belongs_to :user
+ belongs_to :sender, class_name: "User", foreign_key: "sender_id"
+ attr_accessible :at_message, :container, :viewed, :user_id, :sender_id
+ belongs_to :at_message, polymorphic: true
+ belongs_to :container, polymorphic: true
+
+ has_many :message_alls, :class_name => 'MessageAll',:as =>:message, :dependent => :destroy
+ validates :user_id, :sender_id, :at_message_id, :at_message_type, presence: true
+
+ after_create :add_user_message
+
+ scope :unviewed, ->(type, id){
+ where(at_message_type: type, at_message_id:id, viewed: false)
+ }
+
+ def viewed!
+ update_attribute :viewed, true
+ end
+
+ def at_valid?
+ return true if at_message_type == 'Issue'
+ return true if 'Journal' == at_message_type
+ return true if 'JournalsForMessage' == at_message_type
+ return true if 'Message' == at_message_type
+ false
+ end
+
+ def add_user_message
+ if MessageAll.where(message_type: self.class.name,message_id: self.id).empty?
+ self.message_alls << MessageAll.new(:user_id => self.user_id)
+ end
+ end
+
+ def subject
+ case at_message_type
+ when "Issue"
+ "新建问题: " + at_message.subject
+ when "Journal"
+ "问题留言: " + at_message.journalized.subject
+ when 'Message'
+ if(at_message.topic?)
+ "发布新帖: "
+ else
+ "回复帖子: "
+ end + at_message.subject
+ when 'JournalsForMessage'
+ "作业留言: " + at_message.jour.description
+ else
+ logger.error "error type: #{at_message_type}"
+ end
+ end
+
+ def description
+ case at_message_type
+ when "Issue"
+ at_message.description
+ when "Journal"
+ at_message.notes
+ when 'Message'
+ at_message.content
+ when "JournalsForMessage"
+ at_message.notes
+ else
+ logger.error "error type: #{at_message_type}"
+ end
+ end
+
+ def author
+ case at_message_type
+ when "Issue"
+ at_message.author
+ when "Journal"
+ at_message.user
+ when 'Message'
+ at_message.author
+ when 'JournalsForMessage'
+ at_message.user
+ else
+ logger.error "error type: #{at_message_type}"
+ end
+ end
+
+ def url
+ case at_message_type
+ when "Issue"
+ {controller: :issues, action: :show, id: at_message}
+ when "Journal"
+ {controller: :issues, action: :show, id: at_message.journalized}
+ when 'Message'
+ {controller: :boards, action: :show, project_id: at_message.board.project, id: at_message.board}
+ when 'JournalsForMessage'
+ {controller: :homework_common, action: :index, course: at_message.jour.course_id}
+ else
+ logger.error "error type: #{at_message_type}"
+ end
+
+ end
+
+end
diff --git a/app/models/journal.rb b/app/models/journal.rb
index 9ffc5d405..8aec82911 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -31,7 +31,9 @@ class Journal < ActiveRecord::Base
has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
# 被ForgeMessage虚拟关联
has_many :forge_messages, :class_name => 'ForgeMessage',:as =>:forge_message ,:dependent => :destroy
- # end
+
+ has_many :at_messages, as: :at_message, dependent: :destroy
+
attr_accessor :indice
acts_as_event :title =>Proc.new {|o| status = ((s = o.new_status) ? " (#{s})" : nil); "#{o.issue.tracker} ##{o.issue.project_index}#{status}: #{o.issue.subject}" },
@@ -50,7 +52,7 @@ class Journal < ActiveRecord::Base
before_create :split_private_notes
# fq
- after_save :act_as_activity,:be_user_score,:act_as_forge_activity, :act_as_forge_message
+ after_save :act_as_activity,:be_user_score,:act_as_forge_activity, :act_as_forge_message, :act_as_at_message
# end
#after_destroy :down_user_score
#before_save :be_user_score
@@ -184,6 +186,13 @@ class Journal < ActiveRecord::Base
end
end
+ def act_as_at_message
+ users = self.notes.scan //m
+ users && users.flatten.uniq.each do |uid|
+ self.at_messages << AtMessage.new(user_id: uid, sender_id: self.user_id)
+ end
+ end
+
# 更新用户分数 -by zjc
def be_user_score
#新建了缺陷留言且留言不为空，不为空白
diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index ec6390408..d1431d31f 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -64,8 +64,10 @@ class JournalsForMessage < ActiveRecord::Base
has_many :course_messages, :class_name => 'CourseMessage',:as =>:course_message ,:dependent => :destroy
has_many :user_feedback_messages, :class_name => 'UserFeedbackMessage', :as =>:journals_for_message, :dependent => :destroy
+ has_many :at_messages, as: :at_message, dependent: :destroy
+
validates :notes, presence: true, if: :is_homework_jour?
- after_create :act_as_activity, :act_as_course_activity, :act_as_course_message, :act_as_user_feedback_message, :act_as_principal_activity, :act_as_student_score
+ after_create :act_as_activity, :act_as_course_activity, :act_as_course_message, :act_as_at_message, :act_as_user_feedback_message, :act_as_principal_activity, :act_as_student_score
after_create :reset_counters!
after_destroy :reset_counters!
after_save :be_user_score
@@ -240,6 +242,12 @@ class JournalsForMessage < ActiveRecord::Base
end
end
+ def act_as_at_message
+ users = self.notes.scan //m
+ users && users.flatten.uniq.each do |uid|
+ self.at_messages << AtMessage.new(user_id: uid, sender_id: self.user_id)
+ end
+ end
# 用户留言消息通知
def act_as_user_feedback_message
# 主留言
diff --git a/app/models/message.rb b/app/models/message.rb
index d8f62171a..4cdae1f6e 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -38,7 +38,7 @@ class Message < ActiveRecord::Base
# 课程/项目 消息
has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
has_many :forge_messages, :class_name => 'ForgeMessage', :as => :forge_message, :dependent => :destroy
- #end
+ has_many :at_messages, as: :at_message, dependent: :destroy
has_many :ActivityNotifies,:as => :activity, :dependent => :destroy
@@ -74,7 +74,7 @@ class Message < ActiveRecord::Base
after_update :update_messages_board
after_destroy :reset_counters!,:down_user_score,:delete_kindeditor_assets
- after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity, :act_as_system_message, :send_mail, :act_as_student_score
+ after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity, :act_as_system_message, :send_mail, :act_as_student_score, :act_as_at_message
#before_save :be_user_score
scope :visible, lambda {|*args|
@@ -96,6 +96,10 @@ class Message < ActiveRecord::Base
end
}
+ def topic?
+ parent_id.nil?
+ end
+
def visible?(user=User.current)
if project
!user.nil? && user.allowed_to?(:view_messages, project)
@@ -237,6 +241,13 @@ class Message < ActiveRecord::Base
end
end
end
+
+ def act_as_at_message
+ users = self.content.scan //m
+ users && users.flatten.uniq.each do |uid|
+ self.at_messages << AtMessage.new(user_id: uid, sender_id: self.author_id)
+ end
+ end
#更新用户分数 -by zjc
def be_user_score
diff --git a/app/models/user.rb b/app/models/user.rb
index 7043bd039..2714117e9 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -161,6 +161,7 @@ class User < Principal
has_many :user_feedback_messages
has_one :onclick_time
has_many :system_messages
+ has_many :at_messages
# 虚拟转换
has_many :new_jours, :as => :jour, :class_name => 'JournalsForMessage', :conditions => "status=1"
diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index 074da9af1..00dfc03e3 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -1,5 +1,5 @@
<%= content_for(:header_tags) do %>
- <%= import_ke(enable_at: false, prettify: false) %>
+ <%= import_ke(enable_at: true, prettify: false) %>
<%= javascript_include_tag "init_activity_KindEditor" %>
<% end %>
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 5f6275e9d..839d587b2 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -20,7 +20,7 @@
<% end %>
-
+ 问题跟踪
-
+
- 问题跟踪
+
+
+
\ No newline at end of file
diff --git a/plugins/redmine_ckeditor/app/views/issues/update_form.js.erb b/plugins/redmine_ckeditor/app/views/issues/update_form.js.erb
index e7d3e2ad2..23bd5108b 100644
--- a/plugins/redmine_ckeditor/app/views/issues/update_form.js.erb
+++ b/plugins/redmine_ckeditor/app/views/issues/update_form.js.erb
@@ -9,3 +9,15 @@ $('#all_attributes').html('<%= escape_javascript(render :partial => 'form') %>')
<% else %>
$('#log_time').hide();
<% end %>
+issue_desc_editor = KindEditor.create('#issue_description',
+ {"width":"85%",
+ "resizeType":0,
+ "no_label":true,
+ "autoHeightMode":true,
+ "afterCreate":"eval(function(){ if(typeof enablePasteImg ==='function'){enablePasteImg(self);} if(typeof enableAt ==='function'){enableAt(self);} this.loadPlugin(\"autoheight\"),$(this.toolbar.div).hide();})",
+ "afterFocus":"eval(function(){$(this.toolbar.div).show();})",
+ "afterBlur":"eval(function(){$(this.toolbar.div).hide();})",
+ "emotionsBasePath":"http://localhost:3000",
+ "height":300,"allowFileManager":true,
+ "uploadJson":"/kindeditor/upload",
+ "fileManagerJson":"/kindeditor/filemanager"});
\ No newline at end of file
From b02cb6fdd4c3056e820eff35881ed3008d2373c4 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Thu, 17 Dec 2015 11:30:52 +0800
Subject: [PATCH 053/120] =?UTF-8?q?issue=E7=9A=84=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=9B=B4=E6=94=B9issue=E7=9A=84=E7=B1=BB?=
=?UTF-8?q?=E5=9E=8B=EF=BC=8C=E9=82=A3=E4=B9=88=E5=B0=B1=E4=BC=9A=E6=9C=89?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82=E9=9C=80=E8=A6=81=E9=87=8D=E6=96=B0?=
=?UTF-8?q?=E6=96=B0=E5=BB=BAeditor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/issues/_edit.html.erb | 3 +--
app/views/issues/_form.html.erb | 2 ++
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb
index b1127a3d3..2879c9592 100644
--- a/app/views/issues/_edit.html.erb
+++ b/app/views/issues/_edit.html.erb
@@ -10,8 +10,7 @@
<%# if @journals.present? %>
diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb
index b96b700d5..7cda806a1 100644
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@@ -102,3 +102,5 @@
<%= call_hook(:view_issues_form_details_bottom, {:issue => @issue, :form => f}) %>
<% end %>
+ 确定
+ 取消
\ No newline at end of file
From de229c0f1c494a7fb9804ac8e159f36f4e634ab3 Mon Sep 17 00:00:00 2001
From: ouyangxuhua
Date: Thu, 17 Dec 2015 14:51:02 +0800
Subject: [PATCH 054/120] =?UTF-8?q?=E7=BB=84=E7=BB=87=E8=B5=84=E6=BA=90?=
=?UTF-8?q?=E6=A0=8F=E7=9B=AE=E7=9A=84=E6=96=87=E4=BB=B6=E5=8F=AF=E4=BB=A5?=
=?UTF-8?q?=E8=A2=AB=E5=BC=95=E7=94=A8=E8=87=B3=E5=BD=93=E5=89=8D=E7=BB=84?=
=?UTF-8?q?=E7=BB=87=E4=B8=8B=E7=9A=84=E8=B5=84=E6=BA=90=E6=A0=8F=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/attachments_controller.rb | 40 +++++++++++++++++++
app/controllers/files_controller.rb | 6 +++
app/helpers/application_helper.rb | 2 +
app/helpers/files_helper.rb | 11 +++++
.../add_exist_file_to_org_subfield.js.erb | 8 ++++
app/views/files/_org_subfield_list.html.erb | 5 +++
..._show_quote_resource_org_subfield.html.erb | 31 ++++++++++++++
.../quote_resource_show_org_subfield.js.erb | 11 +++++
config/locales/zh.yml | 2 +
config/routes.rb | 3 +-
10 files changed, 118 insertions(+), 1 deletion(-)
create mode 100644 app/views/attachments/add_exist_file_to_org_subfield.js.erb
create mode 100644 app/views/files/_show_quote_resource_org_subfield.html.erb
create mode 100644 app/views/files/quote_resource_show_org_subfield.js.erb
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index d371ed4cb..664dc4cf5 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -438,6 +438,46 @@ class AttachmentsController < ApplicationController
end
end
+ def add_exist_file_to_org_subfield
+ file = Attachment.find(params[:file_id])
+ org_subfields = params[:org_subfields][:org_subfield]
+ @message = ""
+ org_subfields.each do |org_subfield|
+ s = OrgSubfield.find(org_subfield)
+ if s.attachments.include?file
+ if @message && @message == ""
+ @message += l(:label_resource_subfield_prompt) + c.name + l(:label_contain_resource) + file.filename + l(:label_quote_resource_failed)
+ next
+ else
+ @message += "
" + l(:label_resource_subfield_prompt) + c.name + l(:label_contain_resource) + file.filename + l(:label_quote_resource_failed) + next + end + end + attach_copied_obj = file.copy + attach_copied_obj.tag_list.add(file.tag_list) # tag关联 + attach_copied_obj.container = s + attach_copied_obj.created_on = Time.now + attach_copied_obj.author_id = User.current.id + attach_copied_obj.copy_from = file.copy_from.nil? ? file.id : file.copy_from + if attach_copied_obj.attachtype == nil + attach_copied_obj.attachtype = 4 + end + @obj = s + @save_flag = attach_copied_obj.save + @save_message = attach_copied_obj.errors.full_messages + update_quotes attach_copied_obj + end + respond_to do |format| + format.js + end + rescue NoMethodError + @save_flag = false + @save_message = [] << l(:label_resource_subfield_empty_select) + respond_to do |format| + format.js + end + end + def update_quotes attachment if attachment.copy_from attachments = Attachment.find_by_sql("select * from attachments where copy_from = #{attachment.copy_from} or id = #{attachment.copy_from}") diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index 0cd7d77c2..68f7cc9cb 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -412,6 +412,12 @@ class FilesController < ApplicationController @can_quote = attachment_candown @file end + def quote_resource_show_org_subfield + @file = Attachment.find(params[:id]) + @org_subfield = OrgSubfield.find(params[:org_subfield_id]) + @can_quote = attachment_candown @file + end + def new @versions = @project.versions.sort @course_tag = @project.project_type diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9a622316a..ccbf7099a 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1924,6 +1924,8 @@ module ApplicationHelper elsif attachment.container.is_a?(Course) course = attachment.container candown= User.current.member_of_course?(course) || (course.is_public==1 && attachment.is_public == 1) + elsif attachment.container.is_a?(OrgSubfield) + candown = true elsif (attachment.container.has_attribute?(:board) || attachment.container.has_attribute?(:board_id)) && attachment.container.board && attachment.container.board.course course = attachment.container.board.course diff --git a/app/helpers/files_helper.rb b/app/helpers/files_helper.rb index 276786fb7..bd023f6d0 100644 --- a/app/helpers/files_helper.rb +++ b/app/helpers/files_helper.rb @@ -67,6 +67,17 @@ module FilesHelper s.html_safe end + #带勾选框的组织资源栏目列表 + def org_subfields_check_box_tags(name,org_subfields,attachment) + s = '' + org_subfields.each do |org_subfield| + if !org_subfield.attachments.include?attachment + s << "
" + end + end + s.html_safe + end + #判断用户是否拥有不包含当前资源的课程，需用户在该课程中角色为教师且该课程属于当前学期或下一学期 def has_course? user,file result = false diff --git a/app/views/attachments/add_exist_file_to_org_subfield.js.erb b/app/views/attachments/add_exist_file_to_org_subfield.js.erb new file mode 100644 index 000000000..4c4208f76 --- /dev/null +++ b/app/views/attachments/add_exist_file_to_org_subfield.js.erb @@ -0,0 +1,8 @@ +<% if !@save_flag && @save_message %> + $("#error_show").html("<%= @save_message.join(', ') %>"); +<% elsif @message && @message != "" %> + $("#error_show").html("<%= @message.html_safe %>"); +<% else %> + closeModal(); + location.reload(); +<% end %> \ No newline at end of file diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb index 750aed9ae..029570047 100644 --- a/app/views/files/_org_subfield_list.html.erb +++ b/app/views/files/_org_subfield_list.html.erb @@ -28,6 +28,11 @@ download_named_attachment_path(file.id, file.filename), :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l" %> <% if User.current.logged? %> + <% if !@org_subfield.attachments.all.include?file %> + <%= link_to("选入栏目",quote_resource_show_org_subfield_org_subfield_file_path(:org_subfield_id => @org_subfield.id, :id => file.id),:class => "f_l re_select c_lorange",:remote => true) %> + <% else %> + <%= link_to("选入组织其他栏目",quote_resource_show_org_subfield_org_subfield_file_path(:org_subfield_id => @org_subfield.id, :id => file.id),:class => "f_l re_select c_lorange",:remote => true) %> + <% end %> <%= file_preview_tag(file, class: 'f_l re_open', style:'text-align: center;') %> <% end %>
diff --git a/app/views/files/_show_quote_resource_org_subfield.html.erb b/app/views/files/_show_quote_resource_org_subfield.html.erb
new file mode 100644
index 000000000..ab2eb318d
--- /dev/null
+++ b/app/views/files/_show_quote_resource_org_subfield.html.erb
@@ -0,0 +1,31 @@
+
<%= render :partial => 'issues/detail'%>
@@ -22,30 +22,32 @@
+
-
-
+
-
+
+ 回复（<%= @issue.journals.count %>）
-
-
+
- 回复（<%= @issue.journals.count %>）
+
+
- <%= render :partial => 'issue_replies',:locals => {:issue=>@issue,:replies_all_i=>0} %>
-
+
+ <%= render :partial => 'issue_replies',:locals => {:issue=>@issue,:replies_all_i=>0} %>
+
-
- <%= form_for('new_form',:url => add_journal_issue_path(@issue.id),:method => "post", :remote => true) do |f|%>
-
+
- <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %>
-
-
-
- <%= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
-
+
-
\ No newline at end of file
+
+
+ <%= form_for('new_form',:url => add_journal_issue_path(@issue.id),:method => "post", :remote => true) do |f|%>
+
-
+ <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %>
- 发送
-
- <% end %>
-
+ <%= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
+
+
+ 发送
+
+ <% end %>
+ " + l(:label_resource_subfield_prompt) + c.name + l(:label_contain_resource) + file.filename + l(:label_quote_resource_failed) + next + end + end + attach_copied_obj = file.copy + attach_copied_obj.tag_list.add(file.tag_list) # tag关联 + attach_copied_obj.container = s + attach_copied_obj.created_on = Time.now + attach_copied_obj.author_id = User.current.id + attach_copied_obj.copy_from = file.copy_from.nil? ? file.id : file.copy_from + if attach_copied_obj.attachtype == nil + attach_copied_obj.attachtype = 4 + end + @obj = s + @save_flag = attach_copied_obj.save + @save_message = attach_copied_obj.errors.full_messages + update_quotes attach_copied_obj + end + respond_to do |format| + format.js + end + rescue NoMethodError + @save_flag = false + @save_message = [] << l(:label_resource_subfield_empty_select) + respond_to do |format| + format.js + end + end + def update_quotes attachment if attachment.copy_from attachments = Attachment.find_by_sql("select * from attachments where copy_from = #{attachment.copy_from} or id = #{attachment.copy_from}") diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index 0cd7d77c2..68f7cc9cb 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -412,6 +412,12 @@ class FilesController < ApplicationController @can_quote = attachment_candown @file end + def quote_resource_show_org_subfield + @file = Attachment.find(params[:id]) + @org_subfield = OrgSubfield.find(params[:org_subfield_id]) + @can_quote = attachment_candown @file + end + def new @versions = @project.versions.sort @course_tag = @project.project_type diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9a622316a..ccbf7099a 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1924,6 +1924,8 @@ module ApplicationHelper elsif attachment.container.is_a?(Course) course = attachment.container candown= User.current.member_of_course?(course) || (course.is_public==1 && attachment.is_public == 1) + elsif attachment.container.is_a?(OrgSubfield) + candown = true elsif (attachment.container.has_attribute?(:board) || attachment.container.has_attribute?(:board_id)) && attachment.container.board && attachment.container.board.course course = attachment.container.board.course diff --git a/app/helpers/files_helper.rb b/app/helpers/files_helper.rb index 276786fb7..bd023f6d0 100644 --- a/app/helpers/files_helper.rb +++ b/app/helpers/files_helper.rb @@ -67,6 +67,17 @@ module FilesHelper s.html_safe end + #带勾选框的组织资源栏目列表 + def org_subfields_check_box_tags(name,org_subfields,attachment) + s = '' + org_subfields.each do |org_subfield| + if !org_subfield.attachments.include?attachment + s << "
" + end + end + s.html_safe + end + #判断用户是否拥有不包含当前资源的课程，需用户在该课程中角色为教师且该课程属于当前学期或下一学期 def has_course? user,file result = false diff --git a/app/views/attachments/add_exist_file_to_org_subfield.js.erb b/app/views/attachments/add_exist_file_to_org_subfield.js.erb new file mode 100644 index 000000000..4c4208f76 --- /dev/null +++ b/app/views/attachments/add_exist_file_to_org_subfield.js.erb @@ -0,0 +1,8 @@ +<% if !@save_flag && @save_message %> + $("#error_show").html("<%= @save_message.join(', ') %>"); +<% elsif @message && @message != "" %> + $("#error_show").html("<%= @message.html_safe %>"); +<% else %> + closeModal(); + location.reload(); +<% end %> \ No newline at end of file diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb index 750aed9ae..029570047 100644 --- a/app/views/files/_org_subfield_list.html.erb +++ b/app/views/files/_org_subfield_list.html.erb @@ -28,6 +28,11 @@ download_named_attachment_path(file.id, file.filename), :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l" %> <% if User.current.logged? %> + <% if !@org_subfield.attachments.all.include?file %> + <%= link_to("选入栏目",quote_resource_show_org_subfield_org_subfield_file_path(:org_subfield_id => @org_subfield.id, :id => file.id),:class => "f_l re_select c_lorange",:remote => true) %> + <% else %> + <%= link_to("选入组织其他栏目",quote_resource_show_org_subfield_org_subfield_file_path(:org_subfield_id => @org_subfield.id, :id => file.id),:class => "f_l re_select c_lorange",:remote => true) %> + <% end %> <%= file_preview_tag(file, class: 'f_l re_open', style:'text-align: center;') %> <% end %>
+
+
+
\ No newline at end of file
diff --git a/app/views/files/quote_resource_show_org_subfield.js.erb b/app/views/files/quote_resource_show_org_subfield.js.erb
new file mode 100644
index 000000000..fe34e9624
--- /dev/null
+++ b/app/views/files/quote_resource_show_org_subfield.js.erb
@@ -0,0 +1,11 @@
+<% if @can_quote %>
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'show_quote_resource_org_subfield',:locals => {:org_subfield => @org_subfield,:file => @file,:error => ''}) %>');
+<% else %>
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'show_quote_resource_org_subfield',:locals => {:org_subfield => @org_subfield,:file => @file,:error => '403'}) %>');
+<% end %>
+
+showModal('ajax-modal', '513px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("
+
+将此资源引入组织资源栏目
+ <% if error == '403' %> +
+
+ <% else %>
+ 您没有权限引用此资源
+
+
+ <%= form_tag attachments_add_exist_file_to_org_subfield_path,
+ method: :post,
+ remote: true,
+ id: "relation_file_form" do %>
+ <%= hidden_field_tag(:file_id, file.id) %>
+ <%= content_tag('div', org_subfields_check_box_tags('org_subfields[org_subfield][]',org_subfield.organization.org_subfields.where("field_type='Resource'"),file), :id => 'org_subfields')%>
+ 引 用取 消
+ <% end -%>
+
+ <% end %>
+
+
+ ");
+$('#ajax-modal').parent().css("top","").css("left","");
+$('#ajax-modal').parent().addClass("popbox_polls");
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 81b20a67e..03424bd5a 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1969,9 +1969,11 @@ zh:
label_my_score: 我的评分
field_open_anonymous_evaluation: 是否使用匿评
label_course_empty_select: 尚未选择课程！
+ label_resource_subfield_empty_select: 尚未选择资源栏目！
label_project_empty_select: 尚未选择项目！
label_course_prompt: 课程：
label_project_prompt: 项目：
+ label_resource_subfield_prompt: 资源栏目：
label_contain_resource: 已包含资源：
label_quote_resource_failed: ",此资源引用失败! "
label_file_lost: 以下无法成功下载，请联系相关人员重新上传：
diff --git a/config/routes.rb b/config/routes.rb
index 6dce046de..e68169824 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -81,7 +81,7 @@ RedmineApp::Application.routes.draw do
match "subfield_upload_file", :via => :post
end
member do
- match "quote_resource_show", :via => [:get]
+ match "quote_resource_show_org_subfield", :via => [:get]
end
end
end
@@ -807,6 +807,7 @@ RedmineApp::Application.routes.draw do
post 'attachments/relationfiles', to: 'attachments#add_exist_file_to_projects', as: 'attach_relations'
post 'attachments/courserelationfile', to: 'attachments#add_exist_file_to_course', as: 'course_attach_relation'
post 'attachments/courserelationfiles', to: 'attachments#add_exist_file_to_courses', as: 'course_attach_relations'
+ match 'attachments/add_exist_file_to_org_subfield'
get 'attachments/renderTag/:attchmentId', :to => 'attachments#renderTag', :attchmentId => /\d+/
resources :attachments, :only => [:show, :destroy] do
collection do
From fc63dfcb7bde22f6d8d01c976aa2e695c6939800 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Thu, 17 Dec 2015 15:14:52 +0800
Subject: [PATCH 055/120] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/at_controller.rb | 8 +-
app/controllers/boards_controller.rb | 5 +
app/controllers/homework_common_controller.rb | 8 ++
app/controllers/issues_controller.rb | 8 ++
app/helpers/users_helper.rb | 3 +-
app/models/at_message.rb | 100 ++++++++++++++++++
app/models/journal.rb | 13 ++-
app/models/journals_for_message.rb | 10 +-
app/models/message.rb | 15 ++-
app/models/user.rb | 1 +
app/views/boards/_course_show.html.erb | 2 +-
app/views/boards/_project_show.html.erb | 6 +-
app/views/boards/show.html.erb | 6 +-
app/views/users/_user_at_message.html.erb | 16 +--
.../20151216025539_create_at_messages.rb | 15 +++
...20151216030610_add_sender_to_at_message.rb | 5 +
spec/factories/at_messages.rb | 12 +++
spec/models/at_message_spec.rb | 5 +
18 files changed, 218 insertions(+), 20 deletions(-)
create mode 100644 app/models/at_message.rb
create mode 100644 db/migrate/20151216025539_create_at_messages.rb
create mode 100644 db/migrate/20151216030610_add_sender_to_at_message.rb
create mode 100644 spec/factories/at_messages.rb
create mode 100644 spec/models/at_message_spec.rb
diff --git a/app/controllers/at_controller.rb b/app/controllers/at_controller.rb
index 5664201f3..8c551d0df 100644
--- a/app/controllers/at_controller.rb
+++ b/app/controllers/at_controller.rb
@@ -28,11 +28,17 @@ class AtController < ApplicationController
find_message(id)
when 'HomeworkCommon'
find_homework(id)
+ when 'Topic'
+ find_topic(id)
else
nil
end
end
+ def find_topic(id)
+
+ end
+
def find_issue(id)
#1. issues list persons
#2. project persons
@@ -98,7 +104,7 @@ class AtController < ApplicationController
def find_message(id)
message = Message.find(id)
at_persons = message.board.messages.map(&:author)
-
+ (at_persons || []) + (find_project(message.board.project_id)||[])
end
#News
diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index 2ec3cac0d..22c0d5317 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -79,6 +79,11 @@ class BoardsController < ApplicationController
end
end
end
+
+ @project.boards.messages.each do |m|
+ User.current.at_messages.unviewed('Message', m.id).each {|x| x.viewed!}
+ end
+
elsif @course
query_course_messages = @board.messages
query_course_messages.each do |query_course_message|
diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index a8d6dfe8f..b42868ce1 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -19,6 +19,14 @@ class HomeworkCommonController < ApplicationController
@is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
@is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
@is_new = params[:is_new]
+
+ #设置at已读
+ @homeworks.each do |homework|
+ homework.journals_for_messages.each do |j|
+ User.current.at_messages.unviewed('JournalsForMessage', j.id).each {|x| x.viewed!}
+ end
+ end
+
respond_to do |format|
format.js
format.html
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 6f441c29a..44fc7dcba 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -115,6 +115,14 @@ class IssuesController < ApplicationController
# 当前用户查看指派给他的缺陷消息，则设置消息为已读
query = ForgeMessage.where("forge_message_type =? and user_id =? and forge_message_id =?", "Issue", User.current, @issue).first
query.update_attribute(:viewed, true) unless query.nil?
+
+ # issue 新建的at消息
+ User.current.at_messages.unviewed('Issue', @issue.id).each {|x| x.viewed!}
+ # 回复的at消息
+ @issue.journals.each do |j|
+ User.current.at_messages.unviewed('Journal', j.id).each {|x| x.viewed!}
+ end
+
# 缺陷状态更新
query_journals = @issue.journals
query_journals.each do |query_journal|
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 2935d018a..963284f7f 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -89,7 +89,8 @@ module UsersHelper
forge_count = ForgeMessage.where("user_id =? and viewed =?", user, 0).count
user_feedback_count = UserFeedbackMessage.where("user_id =? and viewed =?", user, 0).count
user_memo_count = MemoMessage.where("user_id =? and viewed =?", user, 0).count
- messages_count = course_count + forge_count + user_feedback_count + user_memo_count
+ at_count = user.at_messages.where(viewed: false).count
+ messages_count = course_count + forge_count + user_feedback_count + user_memo_count + at_count
end
def user_mail_notification_options(user)
diff --git a/app/models/at_message.rb b/app/models/at_message.rb
new file mode 100644
index 000000000..1a75c4aae
--- /dev/null
+++ b/app/models/at_message.rb
@@ -0,0 +1,100 @@
+class AtMessage < ActiveRecord::Base
+ belongs_to :user
+ belongs_to :sender, class_name: "User", foreign_key: "sender_id"
+ attr_accessible :at_message, :container, :viewed, :user_id, :sender_id
+ belongs_to :at_message, polymorphic: true
+ belongs_to :container, polymorphic: true
+
+ has_many :message_alls, :class_name => 'MessageAll',:as =>:message, :dependent => :destroy
+ validates :user_id, :sender_id, :at_message_id, :at_message_type, presence: true
+
+ after_create :add_user_message
+
+ scope :unviewed, ->(type, id){
+ where(at_message_type: type, at_message_id:id, viewed: false)
+ }
+
+ def viewed!
+ update_attribute :viewed, true
+ end
+
+ def at_valid?
+ return true if at_message_type == 'Issue'
+ return true if 'Journal' == at_message_type
+ return true if 'JournalsForMessage' == at_message_type
+ return true if 'Message' == at_message_type
+ false
+ end
+
+ def add_user_message
+ if MessageAll.where(message_type: self.class.name,message_id: self.id).empty?
+ self.message_alls << MessageAll.new(:user_id => self.user_id)
+ end
+ end
+
+ def subject
+ case at_message_type
+ when "Issue"
+ "新建问题: " + at_message.subject
+ when "Journal"
+ "问题留言: " + at_message.journalized.subject
+ when 'Message'
+ if(at_message.topic?)
+ "发布新帖: "
+ else
+ "回复帖子: "
+ end + at_message.subject
+ when 'JournalsForMessage'
+ "作业留言: " + at_message.jour.description
+ else
+ logger.error "error type: #{at_message_type}"
+ end
+ end
+
+ def description
+ case at_message_type
+ when "Issue"
+ at_message.description
+ when "Journal"
+ at_message.notes
+ when 'Message'
+ at_message.content
+ when "JournalsForMessage"
+ at_message.notes
+ else
+ logger.error "error type: #{at_message_type}"
+ end
+ end
+
+ def author
+ case at_message_type
+ when "Issue"
+ at_message.author
+ when "Journal"
+ at_message.user
+ when 'Message'
+ at_message.author
+ when 'JournalsForMessage'
+ at_message.user
+ else
+ logger.error "error type: #{at_message_type}"
+ end
+ end
+
+ def url
+ case at_message_type
+ when "Issue"
+ {controller: :issues, action: :show, id: at_message}
+ when "Journal"
+ {controller: :issues, action: :show, id: at_message.journalized}
+ when 'Message'
+ {controller: :boards, action: :show, project_id: at_message.board.project, id: at_message.board}
+ when 'JournalsForMessage'
+ {controller: :homework_common, action: :index, course: at_message.jour.course_id}
+ else
+ logger.error "error type: #{at_message_type}"
+ end
+
+ end
+
+end
diff --git a/app/models/journal.rb b/app/models/journal.rb
index 9ffc5d405..8aec82911 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -31,7 +31,9 @@ class Journal < ActiveRecord::Base
has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
# 被ForgeMessage虚拟关联
has_many :forge_messages, :class_name => 'ForgeMessage',:as =>:forge_message ,:dependent => :destroy
- # end
+
+ has_many :at_messages, as: :at_message, dependent: :destroy
+
attr_accessor :indice
acts_as_event :title =>Proc.new {|o| status = ((s = o.new_status) ? " (#{s})" : nil); "#{o.issue.tracker} ##{o.issue.project_index}#{status}: #{o.issue.subject}" },
@@ -50,7 +52,7 @@ class Journal < ActiveRecord::Base
before_create :split_private_notes
# fq
- after_save :act_as_activity,:be_user_score,:act_as_forge_activity, :act_as_forge_message
+ after_save :act_as_activity,:be_user_score,:act_as_forge_activity, :act_as_forge_message, :act_as_at_message
# end
#after_destroy :down_user_score
#before_save :be_user_score
@@ -184,6 +186,13 @@ class Journal < ActiveRecord::Base
end
end
+ def act_as_at_message
+ users = self.notes.scan //m
+ users && users.flatten.uniq.each do |uid|
+ self.at_messages << AtMessage.new(user_id: uid, sender_id: self.user_id)
+ end
+ end
+
# 更新用户分数 -by zjc
def be_user_score
#新建了缺陷留言且留言不为空，不为空白
diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index ec6390408..d1431d31f 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -64,8 +64,10 @@ class JournalsForMessage < ActiveRecord::Base
has_many :course_messages, :class_name => 'CourseMessage',:as =>:course_message ,:dependent => :destroy
has_many :user_feedback_messages, :class_name => 'UserFeedbackMessage', :as =>:journals_for_message, :dependent => :destroy
+ has_many :at_messages, as: :at_message, dependent: :destroy
+
validates :notes, presence: true, if: :is_homework_jour?
- after_create :act_as_activity, :act_as_course_activity, :act_as_course_message, :act_as_user_feedback_message, :act_as_principal_activity, :act_as_student_score
+ after_create :act_as_activity, :act_as_course_activity, :act_as_course_message, :act_as_at_message, :act_as_user_feedback_message, :act_as_principal_activity, :act_as_student_score
after_create :reset_counters!
after_destroy :reset_counters!
after_save :be_user_score
@@ -240,6 +242,12 @@ class JournalsForMessage < ActiveRecord::Base
end
end
+ def act_as_at_message
+ users = self.notes.scan //m
+ users && users.flatten.uniq.each do |uid|
+ self.at_messages << AtMessage.new(user_id: uid, sender_id: self.user_id)
+ end
+ end
# 用户留言消息通知
def act_as_user_feedback_message
# 主留言
diff --git a/app/models/message.rb b/app/models/message.rb
index d8f62171a..4cdae1f6e 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -38,7 +38,7 @@ class Message < ActiveRecord::Base
# 课程/项目 消息
has_many :course_messages, :class_name =>'CourseMessage', :as => :course_message, :dependent => :destroy
has_many :forge_messages, :class_name => 'ForgeMessage', :as => :forge_message, :dependent => :destroy
- #end
+ has_many :at_messages, as: :at_message, dependent: :destroy
has_many :ActivityNotifies,:as => :activity, :dependent => :destroy
@@ -74,7 +74,7 @@ class Message < ActiveRecord::Base
after_update :update_messages_board
after_destroy :reset_counters!,:down_user_score,:delete_kindeditor_assets
- after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity, :act_as_system_message, :send_mail, :act_as_student_score
+ after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity, :act_as_system_message, :send_mail, :act_as_student_score, :act_as_at_message
#before_save :be_user_score
scope :visible, lambda {|*args|
@@ -96,6 +96,10 @@ class Message < ActiveRecord::Base
end
}
+ def topic?
+ parent_id.nil?
+ end
+
def visible?(user=User.current)
if project
!user.nil? && user.allowed_to?(:view_messages, project)
@@ -237,6 +241,13 @@ class Message < ActiveRecord::Base
end
end
end
+
+ def act_as_at_message
+ users = self.content.scan //m
+ users && users.flatten.uniq.each do |uid|
+ self.at_messages << AtMessage.new(user_id: uid, sender_id: self.author_id)
+ end
+ end
#更新用户分数 -by zjc
def be_user_score
diff --git a/app/models/user.rb b/app/models/user.rb
index 7043bd039..2714117e9 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -161,6 +161,7 @@ class User < Principal
has_many :user_feedback_messages
has_one :onclick_time
has_many :system_messages
+ has_many :at_messages
# 虚拟转换
has_many :new_jours, :as => :jour, :class_name => 'JournalsForMessage', :conditions => "status=1"
diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index 074da9af1..00dfc03e3 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -1,5 +1,5 @@
<%= content_for(:header_tags) do %>
- <%= import_ke(enable_at: false, prettify: false) %>
+ <%= import_ke(enable_at: true, prettify: false) %>
<%= javascript_include_tag "init_activity_KindEditor" %>
<% end %>
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 5f6275e9d..839d587b2 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -20,7 +20,7 @@
<% end %>
-