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

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

diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index d7a10005764ba78011b2e68df59089575fc180fe..3aba63c330b080bdb5b23ab9088499929ab45a86 100644 (file)
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -4,30 +4,69 @@ class Ability
   include CanCan::Ability
 
   def initialize(user)
   include CanCan::Ability
 
   def initialize(user)

-    can [:index, :permalink, :edit, :help, :fixthemap, :offline, :export, :about, :preview, :copyright, :key, :id], :site
-    can [:index, :rss, :show, :comments], DiaryEntry
-    can [:search, :search_latlon, :search_ca_postcode, :search_osm_nominatim,
-         :search_geonames, :search_osm_nominatim_reverse, :search_geonames_reverse], :geocoder
-    can [:index, :show], Redaction
-    can [:index, :show, :blocks_on, :blocks_by], UserBlock
-
-    if user
+    can :query, :browse
+    can :show, [Node, Way, Relation]
+    can [:index, :show], [OldNode, OldWay, OldRelation]
+    can [:show, :new], Note
+    can :search, :direction
+    can [:index, :permalink, :edit, :help, :fixthemap, :offline, :export, :about, :communities, :preview, :copyright, :key, :id], :site
+    can [:finish, :embed], :export
+    can [:search, :search_latlon, :search_osm_nominatim, :search_osm_nominatim_reverse], :geocoder
+    can [:token, :request_token, :access_token, :test_request], :oauth
+
+    if Settings.status != "database_offline"
+      can [:index, :feed, :show], Changeset
+      can :index, ChangesetComment
+      can [:confirm, :confirm_resend, :confirm_email], :confirmation
+      can [:index, :rss, :show, :comments], DiaryEntry
+      can [:index], Note
+      can [:new, :create, :edit, :update], :password
+      can [:index, :show], Redaction
+      can [:new, :create, :destroy], :session
+      can [:index, :show, :data, :georss], Trace
+      can [:terms, :new, :create, :save, :suspended, :show, :auth_success, :auth_failure], User
+      can [:index, :show, :blocks_on, :blocks_by], UserBlock
+    end
+
+    if user&.active?

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

-      can [:create, :edit, :comment, :subscribe, :unsubscribe], DiaryEntry
-      can [:new, :create], Report
-      can [:read, :read_one, :update, :update_one, :delete_one], UserPreference
-
-      if user.moderator?
-        can [:index, :show, :resolve, :ignore, :reopen], Issue
-        can :create, IssueComment
-        can [:new, :create, :edit, :update, :destroy], Redaction
-        can [:new, :edit, :create, :update, :revoke], UserBlock
-      end
+      can [:revoke, :authorize], :oauth
+      can [:show], :deletion
+
+      if Settings.status != "database_offline"
+        can [:subscribe, :unsubscribe], Changeset
+        can [:index, :new, :create, :show, :edit, :update, :destroy], ClientApplication
+        can [:index, :new, :create, :show, :edit, :update, :destroy], :oauth2_application
+        can [:index, :destroy], :oauth2_authorized_application
+        can [:new, :show, :create, :destroy], :oauth2_authorization
+        can [:edit, :update, :destroy], :account
+        can [:show], :dashboard
+        can [:new, :create, :edit, :update, :comment, :subscribe, :unsubscribe], DiaryEntry
+        can [:make_friend, :remove_friend], Friendship
+        can [:new, :create, :reply, :show, :inbox, :outbox, :muted, :mark, :unmute, :destroy], Message
+        can [:close, :reopen], Note
+        can [:show, :edit, :update], :preference
+        can [:edit, :update], :profile
+        can [:new, :create], Report
+        can [:mine, :new, :create, :edit, :update, :destroy], Trace
+        can [:account, :go_public], User
+        can [:index, :create, :destroy], UserMute
+
+        if user.moderator?
+          can [:hide, :unhide, :hidecomment, :unhidecomment], DiaryEntry
+          can [:index, :show, :resolve, :ignore, :reopen], Issue
+          can :create, IssueComment
+          can [:new, :create, :edit, :update, :destroy], Redaction
+          can [:new, :edit, :create, :update, :revoke, :revoke_all], UserBlock
+        end

 
 

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

       end
     end
 
       end
     end