Escape each portion of a semicolon seprated value individually

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

diff --git a/app/abilities/api_ability.rb b/app/abilities/api_ability.rb
index 217fe9713c8745f0c666e261389175e883425834..9b274ec845d299f2ee6af894e80cb0f3ac0dac3a 100644 (file)
--- a/app/abilities/api_ability.rb
+++ b/app/abilities/api_ability.rb
@@ -23,7 +23,7 @@ class ApiAbility
       can [:history, :version], OldRelation
     end
 
       can [:history, :version], OldRelation
     end
 

-    if user
+    if user&.active?

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


@@ -37,7 +37,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