github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-28 13:51:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Take action should agree with all pending flags

Browse Source
This commit is contained in:
Robin Ward
2019-04-08 12:39:18 -04:00
parent 0fc798c2ef
commit df1ab9259b
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/post_action_creator.rb
View File

@ -89,6 +89,12 @@ class PostActionCreator
PostActionNotifier.post_action_created(post_action)
notify_subscribers
# agree with other flags
if @take_action && reviewable = @post.reviewable_flag
result.reviewable.perform(@created_by, :agree_and_keep)
post_action.try(:update_counters)
end
result.success = true
result.post_action = post_action
@ -211,12 +217,6 @@ private
GivenDailyLike.increment_for(@created_by.id) if @post_action_type_id == PostActionType.types[:like]
# agree with other flags
if @take_action && reviewable = @post.reviewable_flag
reviewable.perform(@created_by, :agree_and_keep)
post_action.try(:update_counters)
end
post_action
rescue ActiveRecord::RecordNotUnique
# can happen despite being .create