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

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

diff --git a/app/abilities/api_capability.rb b/app/abilities/api_capability.rb
index 9f59b1f2442f3568f67395e629b393563dc8e34b..beb4d39bf3fa62ba20641899a89220cb91594b71 100644 (file)
--- a/app/abilities/api_capability.rb
+++ b/app/abilities/api_capability.rb
@@ -6,15 +6,15 @@ class ApiCapability
   def initialize(token)
     if Settings.status != "database_offline"
       can [:create, :comment, :close, :reopen], Note if capability?(token, :allow_write_notes)
   def initialize(token)
     if Settings.status != "database_offline"
       can [:create, :comment, :close, :reopen], Note if capability?(token, :allow_write_notes)

-      can [:api_read, :api_data], Trace if capability?(token, :allow_read_gpx)
-      can [:api_create, :api_update, :api_delete], Trace if capability?(token, :allow_write_gpx)
-      can [:api_details], User if capability?(token, :allow_read_prefs)
-      can [:api_gpx_files], User if capability?(token, :allow_read_gpx)
-      can [:read, :read_one], UserPreference if capability?(token, :allow_read_prefs)
-      can [:update, :update_one, :delete_one], UserPreference if capability?(token, :allow_write_prefs)
+      can [:show, :data], Trace if capability?(token, :allow_read_gpx)
+      can [:create, :update, :destroy], Trace if capability?(token, :allow_write_gpx)
+      can [:details], User if capability?(token, :allow_read_prefs)
+      can [:gpx_files], User if capability?(token, :allow_read_gpx)
+      can [:index, :show], UserPreference if capability?(token, :allow_read_prefs)
+      can [:update, :update_all, :destroy], UserPreference if capability?(token, :allow_write_prefs)

 
       if token&.user&.terms_agreed?
 
       if token&.user&.terms_agreed?

-        can [:create, :update, :upload, :close, :subscribe, :unsubscribe, :expand_bbox], Changeset if capability?(token, :allow_write_api)
+        can [:create, :update, :upload, :close, :subscribe, :unsubscribe], Changeset if capability?(token, :allow_write_api)

         can :create, ChangesetComment if capability?(token, :allow_write_api)
         can [:create, :update, :delete], Node if capability?(token, :allow_write_api)
         can [:create, :update, :delete], Way if capability?(token, :allow_write_api)
         can :create, ChangesetComment if capability?(token, :allow_write_api)
         can [:create, :update, :delete], Node if capability?(token, :allow_write_api)
         can [:create, :update, :delete], Way if capability?(token, :allow_write_api)