rubocop

YaleSTC · Mar 23, 2015 · 1a2f8e6 · 1a2f8e6
1 parent 6d09940
commit 1a2f8e6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/models/ability.rb b/app/models/ability.rb
@@ -28,8 +28,8 @@ def initialize(user) # rubocop:disable all
         end
         can :read, EquipmentObject
         can :read, EquipmentModel
-        can :override, :reservation_errors if AppConfig.check(:override_on_create)
-        can :override, :checkout_errors if AppConfig.check(:override_at_checkout)
+        can :override, :reservation_errors if AppConfig.get(:override_on_create)
+        can :override, :checkout_errors if AppConfig.get(:override_at_checkout)
       when 'normal' || 'checkout'
         can [:update, :show], User, id: user.id
         can :read, EquipmentModel

diff --git a/app/models/app_config.rb b/app/models/app_config.rb
@@ -23,6 +23,6 @@ def self.check(prop, val = false)
 
   def self.get(prop, val = false)
     # alias for semantics
-    return AppConfig.check(prop, val)
+    AppConfig.check(prop, val)
   end
 end