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

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

diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index b8aa826892f78d9700e06e361622293bb88dca23..05f4952ac21907e0c1fbdcd869f94f134449f726 100644 (file)
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -4,61 +4,72 @@ 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, :new_note, :query], :browse
+    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, :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 [:token, :request_token, :access_token, :test_request], :oauth
+    can [:search, :search_latlon, :search_osm_nominatim, :search_osm_nominatim_reverse], :geocoder

 
     if Settings.status != "database_offline"
 
     if Settings.status != "database_offline"

-      can [:index, :feed], Changeset
-      can :index, ChangesetComment
-      can [:index, :rss, :show, :comments], DiaryEntry
+      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 [:index], Note

-      can [:index, :show], Redaction
-      can [:new, :create, :destroy], :session
-      can [:index, :show, :data, :georss, :picture, :icon], Trace
-      can [:terms, :new, :create, :save, :confirm, :confirm_resend, :confirm_email, :lost_password, :reset_password, :show, :auth_success, :auth_failure], User
-      can [:index, :show, :blocks_on, :blocks_by], UserBlock
-      can [:index, :show], Node
-      can [:index, :show, :full, :ways_for_node], Way
-      can [:index, :show, :full, :relations_for_node, :relations_for_way, :relations_for_relation], Relation
-      can [:history, :version], OldNode
-      can [:history, :version], OldWay
-      can [:history, :version], OldRelation
+      can [:create, :update], :password
+      can :read, Redaction
+      can [:create, :destroy], :session
+      can [:read, :data, :georss], Trace
+      can [:read, :create, :suspended, :auth_success, :auth_failure], User
+      can :read, UserBlock

     end
 
     end
 

-    if user
+    if user&.active?

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

-      can [:revoke, :authorize], :oauth
+      can :read, [:deletion, :account_terms]

 
       if Settings.status != "database_offline"
 
       if Settings.status != "database_offline"

-        can [:index, :new, :create, :show, :edit, :update, :destroy], ClientApplication
-        can [:new, :create, :edit, :update, :comment, :subscribe, :unsubscribe], DiaryEntry
+        can [:subscribe, :unsubscribe], Changeset
+        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 [:make_friend, :remove_friend], Friendship
         can [:make_friend, :remove_friend], Friendship

-        can [:new, :create, :reply, :show, :inbox, :outbox, :mark, :destroy], Message
+        can [:read, :create, :mark, :unmute, :destroy], Message

         can [:close, :reopen], Note
         can [:close, :reopen], Note

-        can [:new, :create], Report
-        can [:mine, :new, :create, :edit, :update, :destroy], Trace
+        can [:read, :update], :preference
+        can :update, :profile
+        can :create, Report
+        can [:mine, :create, :update, :destroy], Trace

         can [:account, :go_public], User
         can [:account, :go_public], User

+        can [:read, :create, :destroy], UserMute

 
         if user.moderator?
 
         if user.moderator?

-          can [:hide, :hidecomment], DiaryEntry
-          can [:index, :show, :resolve, :ignore, :reopen], Issue
+          can [:hide, :unhide], [DiaryEntry, DiaryComment]
+          can [:read, :resolve, :ignore, :reopen], Issue

           can :create, IssueComment
           can :create, IssueComment

-          can [:new, :create, :edit, :update, :destroy], Redaction
-          can [:new, :edit, :create, :update, :revoke], UserBlock
+          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?
         end
 
         if user.administrator?

-          can [:hide, :unhide, :hidecomment, :unhidecomment], DiaryEntry
-          can [:index, :show, :resolve, :ignore, :reopen], Issue
+          can [:hide, :unhide], [DiaryEntry, DiaryComment]
+          can [:read, :resolve, :ignore, :reopen], Issue

           can :create, IssueComment
           can :create, IssueComment

-          can [:set_status, :destroy, :index], User
-          can [:grant, :revoke], UserRole
+          can [:set_status, :destroy], User
+          can [:read, :update], :users_list
+          can [:create, :destroy], UserRole

         end
       end
     end
         end
       end
     end