Adjust sizes of changeset element headers/pagination

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

diff --git a/app/abilities/api_ability.rb b/app/abilities/api_ability.rb
index 217fe9713c8745f0c666e261389175e883425834..fe39f5eb5aa2475a4d1c56fa9456e9a8842d117a 100644 (file)
--- a/app/abilities/api_ability.rb
+++ b/app/abilities/api_ability.rb
@@ -21,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
 


@@ -37,7 +38,7 @@ class ApiAbility
         can [:index, :show, :update, :update_all, :destroy], UserPreference
 
         if user.terms_agreed?
         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
           can :create, ChangesetComment
           can [:create, :update, :delete], Node
           can [:create, :update, :delete], Way