Collect node/way/relation CanCanCan subjects into arrays
This commit is contained in:
parent
c91bd55222
commit
511ce4ab89
3 changed files with 5 additions and 19 deletions
|
@ -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
|
||||
|
|
|
@ -29,20 +29,14 @@ class ApiAbility
|
|||
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
|
||||
|
|
|
@ -23,19 +23,13 @@ class ApiCapability
|
|||
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
|
||||
|
|
Loading…
Add table
Reference in a new issue