Skip to content

Commit

Permalink
Collect node/way/relation CanCanCan subjects into arrays
Browse files Browse the repository at this point in the history
  • Loading branch information
AntonKhorev committed Mar 13, 2024
1 parent c91bd55 commit 511ce4a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 19 deletions.
4 changes: 1 addition & 3 deletions app/abilities/ability.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ class Ability

def initialize(user)
can [:relation, :relation_history, :way, :way_history, :node, :node_history, :query], :browse
can [:show], OldNode
can [:show], OldWay
can [:show], OldRelation
can [:show], [OldNode, OldWay, OldRelation]
can [:show, :new], Note
can :search, :direction
can [:index, :permalink, :edit, :help, :fixthemap, :offline, :export, :about, :communities, :preview, :copyright, :key, :id], :site
Expand Down
10 changes: 2 additions & 8 deletions app/abilities/api_ability.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,14 @@ def initialize(user)
if user.terms_agreed?
can [:create, :update, :upload, :close, :subscribe, :unsubscribe], Changeset
can :create, ChangesetComment
can [:create, :update, :delete], Node
can [:create, :update, :delete], Way
can [:create, :update, :delete], Relation
can [:create, :update, :delete], [Node, Way, Relation]
end

if user.moderator?
can [:destroy, :restore], ChangesetComment
can :destroy, Note

if user.terms_agreed?
can :redact, OldNode
can :redact, OldWay
can :redact, OldRelation
end
can :redact, [OldNode, OldWay, OldRelation] if user.terms_agreed?
end
end
end
Expand Down
10 changes: 2 additions & 8 deletions app/abilities/api_capability.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,13 @@ def initialize(token)
if user.terms_agreed?
can [:create, :update, :upload, :close, :subscribe, :unsubscribe], Changeset if scope?(token, :write_api)
can :create, ChangesetComment if scope?(token, :write_api)
can [:create, :update, :delete], Node if scope?(token, :write_api)
can [:create, :update, :delete], Way if scope?(token, :write_api)
can [:create, :update, :delete], Relation if scope?(token, :write_api)
can [:create, :update, :delete], [Node, Way, Relation] if scope?(token, :write_api)
end

if user.moderator?
can [:destroy, :restore], ChangesetComment if scope?(token, :write_api)
can :destroy, Note if scope?(token, :write_notes)
if user&.terms_agreed?
can :redact, OldNode if scope?(token, :write_api) || scope?(token, :write_redactions)
can :redact, OldWay if scope?(token, :write_api) || scope?(token, :write_redactions)
can :redact, OldRelation if scope?(token, :write_api) || scope?(token, :write_redactions)
end
can :redact, [OldNode, OldWay, OldRelation] if user&.terms_agreed? && (scope?(token, :write_api) || scope?(token, :write_redactions))
end
end
end
Expand Down

0 comments on commit 511ce4a

Please sign in to comment.