From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 4 Dec 2019 11:48:34 +0000 (+0100)
Subject: Merge pull request #2427 from mmd-osm/patch/remove_expand_bbox
X-Git-Tag: live~2313
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f1c6a87aa137c11d0aff5a4b0e563ac2c2a8f82d

Merge pull request #2427 from mmd-osm/patch/remove_expand_bbox

Remove expand_bbox endpoint
---

f1c6a87aa137c11d0aff5a4b0e563ac2c2a8f82d
diff --cc app/abilities/api_ability.rb
index 217fe9713,7aef15f11..62cd2b17e
--- a/app/abilities/api_ability.rb
+++ b/app/abilities/api_ability.rb
@@@ -34,10 -34,10 +34,10 @@@ class ApiAbilit
          can [:new, :create], Report
          can [:create, :show, :update, :destroy, :data], Trace
          can [:details, :gpx_files], User
 -        can [:read, :read_one, :update, :update_one, :delete_one], UserPreference
 +        can [:index, :show, :update, :update_all, :destroy], UserPreference
  
          if user.terms_agreed?
-           can [:create, :update, :upload, :close, :subscribe, :unsubscribe, :expand_bbox], Changeset
+           can [:create, :update, :upload, :close, :subscribe, :unsubscribe], Changeset
            can :create, ChangesetComment
            can [:create, :update, :delete], Node
            can [:create, :update, :delete], Way
diff --cc app/abilities/api_capability.rb
index 64861f1d6,a4ca25204..beb4d39bf
--- a/app/abilities/api_capability.rb
+++ b/app/abilities/api_capability.rb
@@@ -10,11 -10,11 +10,11 @@@ class ApiCapabilit
        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 [:read, :read_one], UserPreference if capability?(token, :allow_read_prefs)
 -      can [:update, :update_one, :delete_one], UserPreference if capability?(token, :allow_write_prefs)
 +      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?
-         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)