Code cleanup: RuboCop: Fix Style/IdenticalConditionalBranches in app/models/project.rb

git-svn-id: http://svn.redmine.org/redmine/trunk@18380 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 9005a86ef4e273d1e9c19f48d3f17518827ca4e4..b8620be7f334a0e195ad08a2f857816b56ec2595 100644 (file)
--- 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 88d1c6eb59627064594d36280bc9b26cada53c3d..1e925751a174b914482a38c160fe8732bc69bee5 100644 (file)
--- 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|