diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 9005a86ef..b8620be7f 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1390,7 +1390,6 @@ Style/HashSyntax: Style/IdenticalConditionalBranches: Exclude: - - 'app/models/project.rb' - 'config/initializers/10-patches.rb' - 'lib/redmine/wiki_formatting/textile/redcloth3.rb' diff --git a/app/models/project.rb b/app/models/project.rb index 88d1c6eb5..1e925751a 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -93,14 +93,8 @@ class Project < ActiveRecord::Base scope :all_public, lambda { where(:is_public => true) } scope :visible, lambda {|*args| where(Project.visible_condition(args.shift || User.current, *args)) } scope :allowed_to, lambda {|*args| - user = User.current - permission = nil - if args.first.is_a?(Symbol) - permission = args.shift - else - user = args.shift - permission = args.shift - end + user = args.first.is_a?(Symbol) ? User.current : args.shift + permission = args.shift where(Project.allowed_to_condition(user, permission, *args)) } scope :like, lambda {|arg|