Merge remote-tracking branch 'upstream/pull/5398'

[rails.git] / app / abilities / api_ability.rb

diff --git a/app/abilities/api_ability.rb b/app/abilities/api_ability.rb
index 8ee280b3a116d2f464c9114b1c65f47b45d50d39..c790da66ab522f1b6fcbed3baee9cfa214b5b4f1 100644 (file)
--- a/app/abilities/api_ability.rb
+++ b/app/abilities/api_ability.rb
@@ -10,7 +10,7 @@ class ApiAbility
     can :show, :version
 
     if Settings.status != "database_offline"
     can :show, :version
 
     if Settings.status != "database_offline"

-      can [:show, :download, :query], Changeset
+      can [:index, :show, :download], Changeset

       can [:index, :create, :feed, :show, :search], Note
       can :index, Tracepoint
       can [:index, :show], User
       can [:index, :create, :feed, :show, :search], Note
       can :index, Tracepoint
       can [:index, :show], User


@@ -22,27 +22,21 @@ class ApiAbility
 
       if user&.active?
         can [:comment, :close, :reopen], Note
 
       if user&.active?
         can [:comment, :close, :reopen], Note

-        can [:create, :show, :update, :destroy, :data], Trace
+        can [:create, :show, :update, :destroy], Trace

         can [:details, :gpx_files], User
         can [:index, :show, :update, :update_all, :destroy], UserPreference
 
         if user.terms_agreed?
           can [:create, :update, :upload, :close, :subscribe, :unsubscribe], Changeset
           can :create, ChangesetComment
         can [:details, :gpx_files], User
         can [:index, :show, :update, :update_all, :destroy], UserPreference
 
         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
 
         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
         end
       end
     end