cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make rubocop happy

Browse source
This commit is contained in:
Chris Flipse 2018-06-17 20:27:17 -04:00
parent 91fc65a2e3
commit 25256a4849
7 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/ability.rb
View file

@ -17,9 +17,7 @@ class Ability
can [:create, :edit, :comment, :subscribe, :unsubscribe], DiaryEntry
if user.administrator?
can [:hide, :hidecomment], [DiaryEntry, DiaryComment]
end
can [:hide, :hidecomment], [DiaryEntry, DiaryComment] if user.administrator?
end
# Define abilities for the passed in user here. For example:
#

8
app/models/capability.rb
View file

@ -5,15 +5,17 @@ class Capability
def initialize(user, token)
if user
can [:read, :read_one], UserPreference if has_capability?(token, :allow_read_prefs)
can [:update, :update_one, :delete_one], UserPreference if has_capability?(token, :allow_write_prefs)
can [:read, :read_one], UserPreference if capability?(token, :allow_read_prefs)
can [:update, :update_one, :delete_one], UserPreference if capability?(token, :allow_write_prefs)
end
end
private
# If a user provides no tokens, they've authenticated via a non-oauth method
# and permission to access to all capabilities is assumed.
def has_capability?(token, cap)
def capability?(token, cap)
token.nil? || token.read_attribute(cap)
end
end