diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2020-07-04 12:14:27 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2020-07-04 12:14:27 +0000 |
| commit | 9d9d6851b9164cd01bac8131f682688aa4038c9f (patch) | |
| tree | 50ec4c5e96ec3ae3e2e1468b7dcd0cbf32a335d2 /app/models/issue_query.rb | |
| parent | a425be37b8410248d10e4f79dc39e1fb1b70c693 (diff) | |
| download | redmine-9d9d6851b9164cd01bac8131f682688aa4038c9f.tar.gz redmine-9d9d6851b9164cd01bac8131f682688aa4038c9f.zip | |
avoid multi-line ternary operators in app/models/issue_query.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@19856 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/issue_query.rb')
| -rw-r--r-- | app/models/issue_query.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/models/issue_query.rb b/app/models/issue_query.rb index f33837337..79905b11a 100644 --- a/app/models/issue_query.rb +++ b/app/models/issue_query.rb @@ -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}" + |