Merge pull request #3473 from binaryage/hipchat-plugin

Add missing events for discourse-hipchat-plugin
This commit is contained in:
Régis Hanol 2015-05-15 14:10:05 +02:00
commit 48f4fe7e7a
2 changed files with 6 additions and 0 deletions

View File

@ -261,6 +261,8 @@ class TopicsController < ApplicationController
first_post = topic.ordered_posts.first first_post = topic.ordered_posts.first
PostDestroyer.new(current_user, first_post, { context: params[:context] }).destroy PostDestroyer.new(current_user, first_post, { context: params[:context] }).destroy
DiscourseEvent.trigger(:topic_destroyed, topic, current_user)
render nothing: true render nothing: true
end end
@ -271,6 +273,8 @@ class TopicsController < ApplicationController
first_post = topic.posts.with_deleted.order(:post_number).first first_post = topic.posts.with_deleted.order(:post_number).first
PostDestroyer.new(current_user, first_post).recover PostDestroyer.new(current_user, first_post).recover
DiscourseEvent.trigger(:topic_recovered, topic, current_user)
render nothing: true render nothing: true
end end

View File

@ -46,6 +46,7 @@ class PostDestroyer
elsif @user.id == @post.user_id elsif @user.id == @post.user_id
mark_for_deletion mark_for_deletion
end end
DiscourseEvent.trigger(:post_destroyed, @post, @opts, @user)
end end
def recover def recover
@ -57,6 +58,7 @@ class PostDestroyer
topic = Topic.with_deleted.find @post.topic_id topic = Topic.with_deleted.find @post.topic_id
topic.recover! if @post.is_first_post? topic.recover! if @post.is_first_post?
topic.update_statistics topic.update_statistics
DiscourseEvent.trigger(:post_recovered, @post, @opts, @user)
end end
def staff_recovered def staff_recovered