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

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

diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index c8d18b9aa6e6c287a9e4bb3e42d36592d0ba8c3f..725ceccb2cc8a144d27a2bc5436608b8a6516426 100644 (file)
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -7,7 +7,7 @@ class Ability
     can :query, :browse
     can :show, [Node, Way, Relation]
     can [:index, :show], [OldNode, OldWay, OldRelation]
     can :query, :browse
     can :show, [Node, Way, Relation]
     can [:index, :show], [OldNode, OldWay, OldRelation]

-    can [:show, :new], Note
+    can [:show, :create], 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, :direction
     can [:index, :permalink, :edit, :help, :fixthemap, :offline, :export, :about, :communities, :preview, :copyright, :key, :id], :site
     can [:finish, :embed], :export


@@ -20,11 +20,11 @@ class Ability
       can [:index, :rss, :show], DiaryEntry
       can :index, DiaryComment
       can [:index], Note
       can [:index, :rss, :show], DiaryEntry
       can :index, DiaryComment
       can [:index], Note

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

       can [:index, :show], Redaction
       can [:index, :show], Redaction

-      can [:new, :create, :destroy], :session
+      can [:create, :destroy], :session

       can [:index, :show, :data, :georss], Trace
       can [:index, :show, :data, :georss], Trace

-      can [:terms, :new, :create, :save, :suspended, :show, :auth_success, :auth_failure], User
+      can [:terms, :create, :save, :suspended, :show, :auth_success, :auth_failure], User

       can [:index, :show, :blocks_on, :blocks_by], UserBlock
     end
 
       can [:index, :show, :blocks_on, :blocks_by], UserBlock
     end
 


@@ -34,21 +34,21 @@ class Ability
 
       if Settings.status != "database_offline"
         can [:subscribe, :unsubscribe], Changeset
 
       if Settings.status != "database_offline"
         can [:subscribe, :unsubscribe], Changeset

-        can [:index, :new, :create, :show, :edit, :update, :destroy], :oauth2_application
+        can [:index, :create, :show, :update, :destroy], :oauth2_application

         can [:index, :destroy], :oauth2_authorized_application
         can [:index, :destroy], :oauth2_authorized_application

-        can [:new, :show, :create, :destroy], :oauth2_authorization
-        can [:edit, :update, :destroy], :account
+        can [:show, :create, :destroy], :oauth2_authorization
+        can [:update, :destroy], :account

         can [:show], :dashboard
         can [:show], :dashboard

-        can [:new, :create, :subscribe, :unsubscribe], DiaryEntry
+        can [:create, :subscribe, :unsubscribe], DiaryEntry

         can :update, DiaryEntry, :user => user
         can [:create], DiaryComment
         can [:make_friend, :remove_friend], Friendship
         can :update, DiaryEntry, :user => user
         can [:create], DiaryComment
         can [:make_friend, :remove_friend], Friendship

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

         can [:close, :reopen], Note
         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 [:show, :update], :preference
+        can :update, :profile
+        can :create, Report
+        can [:mine, :create, :update, :destroy], Trace

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


@@ -56,8 +56,8 @@ 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, :create, :revoke_all], UserBlock
+          can [:create, :update, :destroy], Redaction
+          can [:create, :revoke_all], UserBlock

           can :update, UserBlock, :creator => user
           can :update, UserBlock, :revoker => user
           can :update, UserBlock, :active? => true
           can :update, UserBlock, :creator => user
           can :update, UserBlock, :revoker => user
           can :update, UserBlock, :active? => true


@@ -68,7 +68,7 @@ class Ability
           can [:index, :show, :resolve, :ignore, :reopen], Issue
           can :create, IssueComment
           can [:set_status, :destroy, :index], User
           can [:index, :show, :resolve, :ignore, :reopen], Issue
           can :create, IssueComment
           can [:set_status, :destroy, :index], User

-          can [:grant, :revoke], UserRole
+          can [:create, :destroy], UserRole

         end
       end
     end
         end
       end
     end