From edc94dabb34296c8417bfa5d67d1b445fed13065 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Mon, 30 Sep 2019 11:42:26 +0000 Subject: [PATCH] code cleanup: rubocop: fix Layout/ElseAlignment in Issue class visible_condition method git-svn-id: http://svn.redmine.org/redmine/trunk@18565 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/issue.rb | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index 97808306a..9ccf310e9 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -120,22 +120,23 @@ class Issue < ActiveRecord::Base # Returns a SQL conditions string used to find all issues visible by the specified user def self.visible_condition(user, options={}) Project.allowed_to_condition(user, :view_issues, options) do |role, user| - sql = if user.id && user.logged? - case role.issues_visibility - when 'all' - '1=1' - when 'default' - user_ids = [user.id] + user.groups.pluck(:id).compact - "(#{table_name}.is_private = #{connection.quoted_false} OR #{table_name}.author_id = #{user.id} OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))" - when 'own' - user_ids = [user.id] + user.groups.pluck(:id).compact - "(#{table_name}.author_id = #{user.id} OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))" + sql = + if user.id && user.logged? + case role.issues_visibility + when 'all' + '1=1' + when 'default' + user_ids = [user.id] + user.groups.pluck(:id).compact + "(#{table_name}.is_private = #{connection.quoted_false} OR #{table_name}.author_id = #{user.id} OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))" + when 'own' + user_ids = [user.id] + user.groups.pluck(:id).compact + "(#{table_name}.author_id = #{user.id} OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))" + else + '1=0' + end else - '1=0' + "(#{table_name}.is_private = #{connection.quoted_false})" end - else - "(#{table_name}.is_private = #{connection.quoted_false})" - end unless role.permissions_all_trackers?(:view_issues) tracker_ids = role.permissions_tracker_ids(:view_issues) if tracker_ids.any? -- 2.39.5