Merge pull request #4201 from AntonKhorev/issues-limit-settings

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

diff --git a/app/abilities/api_ability.rb b/app/abilities/api_ability.rb
index 80245eeaa34882e6acd71d3930436b5d9d13f4d1..fe39f5eb5aa2475a4d1c56fa9456e9a8842d117a 100644 (file)
--- a/app/abilities/api_ability.rb
+++ b/app/abilities/api_ability.rb
@@ -8,7 +8,6 @@ class ApiAbility
     can :index, :change
     can :index, :map
     can :show, :permission
     can :index, :change
     can :index, :map
     can :show, :permission

-    can [:search_all, :search_nodes, :search_ways, :search_relations], :search

     can :show, :version
 
     if Settings.status != "database_offline"
     can :show, :version
 
     if Settings.status != "database_offline"


@@ -22,9 +21,10 @@ class ApiAbility
       can [:history, :version], OldNode
       can [:history, :version], OldWay
       can [:history, :version], OldRelation
       can [:history, :version], OldNode
       can [:history, :version], OldWay
       can [:history, :version], OldRelation

+      can [:show], UserBlock

     end
 
     end
 

-    if user
+    if user&.active?

       can :welcome, :site
       can [:revoke, :authorize], :oauth
 
       can :welcome, :site
       can [:revoke, :authorize], :oauth
 


@@ -35,10 +35,10 @@ class ApiAbility
         can [:new, :create], Report
         can [:create, :show, :update, :destroy, :data], Trace
         can [:details, :gpx_files], User
         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?
 
         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
           can :create, ChangesetComment
           can [:create, :update, :delete], Node
           can [:create, :update, :delete], Way