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

FIX: 'undo flag' marks the flag as disagreed

Browse Source
This commit is contained in:
Régis Hanol
2014-07-30 23:35:42 +02:00
parent 87ca49e26e
commit 220f9e21e3
4 changed files with 50 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/flag_query.rb
View File

@ -112,10 +112,9 @@ module FlagQuery
.joins("INNER JOIN topics ON topics.id = posts.topic_id")
if filter == "old"
post_actions.with_deleted
.where("post_actions.deleted_at IS NOT NULL OR
post_actions.where("post_actions.disagreed_at IS NOT NULL OR
post_actions.defered_at IS NOT NULL OR
post_actions.agreed_at IS NOT NULL")
post_actions.agreed_at IS NOT NULL")
else
post_actions.active
.where("posts.deleted_at" => nil)