]> cat aescling's git repositories - mastodon.git/commitdiff
Fix warning an account outside of a report closing all reports for that account ...
authorClaire <claire.github-309c@sitedethib.com>
Mon, 23 May 2022 18:38:29 +0000 (20:38 +0200)
committersingle-right-quote <11325618-aescling@users.noreply.gitlab.com>
Fri, 27 May 2022 03:54:56 +0000 (23:54 -0400)
* Fix warning an account outside of a report closing all reports for that account

* Make it clear what actions solve other reports

* Revert "Make it clear what actions solve other reports"

This reverts commit ad006de821f72e75480701298d13f0945b509059.

app/models/admin/account_action.rb

index 237975880129f6095e1120734539a4651106908c..aed3bc0c7d7c3b8eb7033b1c83a664ca37bae487 100644 (file)
@@ -164,8 +164,8 @@ class Admin::AccountAction
 
   def reports
     @reports ||= begin
-      if type == 'none' && with_report?
-        [report]
+      if type == 'none'
+        with_report? ? [report] : []
       else
         Report.where(target_account: target_account).unresolved
       end