]> source.dussan.org Git - redmine.git/commitdiff
avoid multi-line ternary operators in app/models/issue_query.rb
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Sat, 4 Jul 2020 12:14:27 +0000 (12:14 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Sat, 4 Jul 2020 12:14:27 +0000 (12:14 +0000)
git-svn-id: http://svn.redmine.org/redmine/trunk@19856 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/models/issue_query.rb

index f338373374ec5a6e1e5e3a410147eb226cc327eb..79905b11a5fea81937ef8daf82d9809743e8a065 100644 (file)
@@ -499,10 +499,12 @@ class IssueQuery < Query
       "(#{nl} #{Issue.table_name}.assigned_to_id #{sw} IN (SELECT DISTINCT #{Member.table_name}.user_id FROM #{Member.table_name}" +
         " WHERE #{Member.table_name}.project_id = #{Issue.table_name}.project_id))"
     when "=", "!"
-      role_cond = value.any? ?
-        "#{MemberRole.table_name}.role_id IN (" + value.collect{|val| "'#{self.class.connection.quote_string(val)}'"}.join(",") + ")" :
-        "1=0"
-
+      role_cond =
+        if value.any?
+          "#{MemberRole.table_name}.role_id IN (" + value.collect{|val| "'#{self.class.connection.quote_string(val)}'"}.join(",") + ")"
+        else
+          "1=0"
+        end
       sw = operator == "!" ? 'NOT' : ''
       nl = operator == "!" ? "#{Issue.table_name}.assigned_to_id IS NULL OR" : ''
       "(#{nl} #{Issue.table_name}.assigned_to_id #{sw} IN (SELECT DISTINCT #{Member.table_name}.user_id FROM #{Member.table_name}, #{MemberRole.table_name}" +