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

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

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

-    can [:relation, :relation_history, :way, :way_history, :node, :node_history, :changeset, :note], :browse
-    can [:index, :feed, :read, :download, :query], Changeset
-    can :index, ChangesetComment
+    can :query, :browse
+    can :read, [Node, Way, Relation, OldNode, OldWay, OldRelation]
+    can [:show, :create], Note

     can :search, :direction
     can :search, :direction

-    can [:index, :permalink, :edit, :help, :fixthemap, :offline, :export, :about, :preview, :copyright, :key, :id], :site
-    can [:index, :rss, :show, :comments], DiaryEntry
+    can [:index, :permalink, :edit, :help, :fixthemap, :offline, :export, :about, :communities, :preview, :copyright, :key, :id], :site

     can [:finish, :embed], :export
     can [:finish, :embed], :export

-    can [:search, :search_latlon, :search_ca_postcode, :search_osm_nominatim,
-         :search_geonames, :search_osm_nominatim_reverse, :search_geonames_reverse], :geocoder
-    can [:index, :create, :comment, :feed, :show, :search, :mine], Note
-    can [:index, :show], Redaction
-    can [:search_all, :search_nodes, :search_ways, :search_relations], :search
-    can [:trackpoints], :swf
-    can [:index, :show, :data, :georss, :picture, :icon], Trace
-    can [:terms, :api_users, :login, :logout, :new, :create, :save, :confirm, :confirm_resend, :confirm_email, :lost_password, :reset_password, :show, :api_read, :auth_success, :auth_failure], User
-    can [:index, :show, :blocks_on, :blocks_by], UserBlock
+    can [:search, :search_latlon, :search_osm_nominatim, :search_osm_nominatim_reverse], :geocoder

 
 

-    if user
+    if Settings.status != "database_offline"
+      can [:read, :feed], Changeset
+      can :read, ChangesetComment
+      can [:confirm, :confirm_resend, :confirm_email], :confirmation
+      can [:read, :rss], DiaryEntry
+      can :read, DiaryComment
+      can [:index], Note
+      can [:create, :update], :password
+      can :read, Redaction
+      can [:create, :destroy], :session
+      can [:read, :data], Trace
+      can [:read, :create, :suspended, :auth_success, :auth_failure], User
+      can :read, UserBlock
+    end
+
+    if user&.active?

       can :welcome, :site
       can :welcome, :site

-      can [:create, :edit, :comment, :subscribe, :unsubscribe], DiaryEntry
-      can [:close, :reopen], Note
-      can [:new, :create], Report
-      can [:mine, :new, :create, :edit, :update, :delete, :api_create, :api_read, :api_update, :api_delete, :api_data], Trace
-      can [:account, :go_public, :make_friend, :remove_friend, :api_details, :api_gpx_files], User
-      can [:read, :read_one, :update, :update_one, :delete_one], UserPreference
+      can :read, [:deletion, :account_terms]

 
 

-      if user.terms_agreed? || !REQUIRE_TERMS_AGREED
-        can [:create, :update, :upload, :close, :subscribe, :unsubscribe, :expand_bbox], Changeset
-        can :create, ChangesetComment
-      end
+      if Settings.status != "database_offline"
+        can [:read, :create, :destroy], :changeset_subscription
+        can [:read, :create, :update, :destroy], :oauth2_application
+        can [:read, :destroy], :oauth2_authorized_application
+        can [:read, :create, :destroy], :oauth2_authorization
+        can [:update, :destroy], :account
+        can :update, :account_terms
+        can :read, :dashboard
+        can [:create, :subscribe, :unsubscribe], DiaryEntry
+        can :update, DiaryEntry, :user => user
+        can [:create], DiaryComment
+        can [:show, :create, :destroy], Follow
+        can [:read, :create, :mark, :unmute, :destroy], Message
+        can [:close, :reopen], Note
+        can [:read, :update], :preference
+        can :update, :profile
+        can :create, Report
+        can [:mine, :create, :update, :destroy], Trace
+        can [:account, :go_public], User
+        can [:read, :create, :destroy], UserMute

 
 

-      if user.moderator?
-        can [:destroy, :restore], ChangesetComment
-        can [:index, :show, :resolve, :ignore, :reopen], Issue
-        can :create, IssueComment
-        can :destroy, Note
-        can [:new, :create, :edit, :update, :destroy], Redaction
-        can [:new, :edit, :create, :update, :revoke], UserBlock
-      end
+        if user.moderator?
+          can [:hide, :unhide], [DiaryEntry, DiaryComment]
+          can [:read, :resolve, :ignore, :reopen], Issue
+          can :create, IssueComment
+          can [:create, :update, :destroy], Redaction
+          can [:create, :destroy], UserBlock
+          can :update, UserBlock, :creator => user
+          can :update, UserBlock, :revoker => user
+          can :update, UserBlock, :active? => true
+        end
+
+        if user.administrator?
+          can [:hide, :unhide], [DiaryEntry, DiaryComment]
+          can [:read, :resolve, :ignore, :reopen], Issue
+          can :create, IssueComment

 
 

-      if user.administrator?
-        can [:hide, :hidecomment], [DiaryEntry, DiaryComment]
-        can [:index, :show, :resolve, :ignore, :reopen], Issue
-        can :create, IssueComment
-        can [:set_status, :delete, :index], User
-        can [:grant, :revoke], UserRole
+          can [:update], :user_status
+          can [:read, :update], :users_list
+          can [:create, :destroy], UserRole
+        end

       end
     end
 
       end
     end