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

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

diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index 907712328b77c4de1d3421ab96525d895d53ff00..d6584f364bd8e24f859486960e6fc69e9c7d14ce 100644 (file)
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -12,16 +12,15 @@ class Ability
     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 [: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
 
     if Settings.status != "database_offline"
       can [:index, :feed, :show], Changeset

-      can :index, ChangesetComment
+      can :show, ChangesetComment

       can [:confirm, :confirm_resend, :confirm_email], :confirmation
       can [:index, :rss, :show], DiaryEntry
       can :index, DiaryComment
       can [:index], Note
       can [:confirm, :confirm_resend, :confirm_email], :confirmation
       can [:index, :rss, :show], DiaryEntry
       can :index, DiaryComment
       can [:index], Note

-      can [:new, :create, :edit, :update], :password
+      can [:new, :create, :update], :password

       can [:index, :show], Redaction
       can [:new, :create, :destroy], :session
       can [:index, :show, :data, :georss], Trace
       can [:index, :show], Redaction
       can [:new, :create, :destroy], :session
       can [:index, :show, :data, :georss], Trace


@@ -31,16 +30,14 @@ class Ability
 
     if user&.active?
       can :welcome, :site
 
     if user&.active?
       can :welcome, :site

-      can [:revoke, :authorize], :oauth

       can [:show], :deletion
 
       if Settings.status != "database_offline"
         can [:subscribe, :unsubscribe], Changeset
       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, :new, :create, :show, :update, :destroy], :oauth2_application

         can [:index, :destroy], :oauth2_authorized_application
         can [:new, :show, :create, :destroy], :oauth2_authorization
         can [:index, :destroy], :oauth2_authorized_application
         can [:new, :show, :create, :destroy], :oauth2_authorization

-        can [:edit, :update, :destroy], :account
+        can [:update, :destroy], :account

         can [:show], :dashboard
         can [:new, :create, :subscribe, :unsubscribe], DiaryEntry
         can :update, DiaryEntry, :user => user
         can [:show], :dashboard
         can [:new, :create, :subscribe, :unsubscribe], DiaryEntry
         can :update, DiaryEntry, :user => user


@@ -48,10 +45,10 @@ class Ability
         can [:make_friend, :remove_friend], Friendship
         can [:new, :create, :reply, :show, :inbox, :outbox, :muted, :mark, :unmute, :destroy], Message
         can [:close, :reopen], Note
         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 [:show, :update], :preference
+        can :update, :profile

         can [:new, :create], Report
         can [:new, :create], Report

-        can [:mine, :new, :create, :edit, :update, :destroy], Trace
+        can [:mine, :new, :create, :update, :destroy], Trace

         can [:account, :go_public], User
         can [:index, :create, :destroy], UserMute
 
         can [:account, :go_public], User
         can [:index, :create, :destroy], UserMute
 


@@ -59,8 +56,11 @@ class Ability
           can [:hide, :unhide], [DiaryEntry, DiaryComment]
           can [:index, :show, :resolve, :ignore, :reopen], Issue
           can :create, IssueComment
           can [:hide, :unhide], [DiaryEntry, DiaryComment]
           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
+          can [:new, :create, :update, :destroy], Redaction
+          can [:new, :create, :revoke_all], UserBlock
+          can :update, UserBlock, :creator => user
+          can :update, UserBlock, :revoker => user
+          can :update, UserBlock, :active? => true

         end
 
         if user.administrator?
         end
 
         if user.administrator?