Code cleanup: RuboCop: Fix Style/UnneededCondition in app/models/setting.rb

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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 0a3abba02c939f1980d93cc9020d55303d6044ee..3a9db8a8720ed25e85cb22d430bcda59680050f1 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1830,7 +1830,6 @@ Style/UnneededCondition:
     - 'app/controllers/messages_controller.rb'
     - 'app/controllers/previews_controller.rb'
     - 'app/models/issue.rb'
-    - 'app/models/setting.rb'
 
 # Cop supports --auto-correct.
 Style/UnneededInterpolation:

diff --git a/app/models/setting.rb b/app/models/setting.rb
index 9eaaaec33c5cb9a3f71d9d07cb54aa8f155a7e54..b5c8ca2e5febd40e5c2ce1ec112f30d58d3074d0 100644 (file)
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -107,13 +107,12 @@ class Setting < ActiveRecord::Base
 
   # Returns the value of the setting named name
   def self.[](name)
-    v = @cached_settings[name]
-    v ? v : (@cached_settings[name] = find_or_default(name).value)
+    @cached_settings[name] ||= find_or_default(name).value
   end
 
   def self.[]=(name, v)
     setting = find_or_default(name)
-    setting.value = (v ? v : "")
+    setting.value = v || ''
     @cached_settings[name] = nil
     setting.save
     setting.value