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

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

diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index dd377a727c817d275fa97d5339aef32904c178ab..bd3ea28bb1e18f151ef593b1c854a4771021f9f0 100644 (file)
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -4,7 +4,7 @@ class Ability
   include CanCan::Ability
 
   def initialize(user)
   include CanCan::Ability
 
   def initialize(user)

-    can :query, :browse
+    can :read, :feature_query

     can :read, [Node, Way, Relation, OldNode, OldWay, OldRelation]
     can [:show, :create], Note
     can :search, :direction
     can :read, [Node, Way, Relation, OldNode, OldWay, OldRelation]
     can [:show, :create], Note
     can :search, :direction


@@ -36,7 +36,7 @@ class Ability
         can [:read, :create, :update, :destroy], :oauth2_application
         can [:read, :destroy], :oauth2_authorized_application
         can [:read, :create, :destroy], :oauth2_authorization
         can [:read, :create, :update, :destroy], :oauth2_application
         can [:read, :destroy], :oauth2_authorized_application
         can [:read, :create, :destroy], :oauth2_authorization

-        can [:update, :destroy], :account
+        can [:read, :update, :destroy], :account

         can :update, :account_terms
         can :create, :account_pd_declaration
         can :read, :dashboard
         can :update, :account_terms
         can :create, :account_pd_declaration
         can :read, :dashboard