1.组织管理员有删除帖子的权限;2.删除帖子后更新org_activities表

This commit is contained in:
ouyangxuhua 2015-12-30 18:44:54 +08:00
parent c2578698f5
commit 68a6f3f7f2
2 changed files with 9 additions and 1 deletions

View File

@ -281,8 +281,10 @@ class MessagesController < ApplicationController
def destroy
if @project
(render_403; return false) unless @message.destroyable_by?(User.current)
else
elsif @course
(render_403; return false) unless @message.course_destroyable_by?(User.current)
else
(render_403; return false) unless @message.org_subfield_editable_by?(User.current)
end
r = @message.to_param
@message.destroy

View File

@ -44,6 +44,8 @@ class Message < ActiveRecord::Base
has_many :ActivityNotifies,:as => :activity, :dependent => :destroy
after_destroy :delete_org_activities
acts_as_searchable :columns => ['subject', 'content'],
:include => {:board => :project},
:project_key => "#{Board.table_name}.project_id",
@ -316,4 +318,8 @@ class Message < ActiveRecord::Base
end
end
end
def delete_org_activities
OrgActivity.where("org_act_type='Message' and org_act_id =#{self.id} and container_type='OrgSubfield'").destroy_all
end
end