Merge branch 'master' into feature/add-communities-page

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

diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index 5b1d7df68546210f7bacfc35853ff97b177efc33..f33ce182dd6a7c7d5f9075c61d85524ee3c9fbdb 100644 (file)
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -7,7 +7,7 @@ class Ability
     can [:relation, :relation_history, :way, :way_history, :node, :node_history,
          :changeset, :note, :new_note, :query], :browse
     can :search, :direction
     can [:relation, :relation_history, :way, :way_history, :node, :node_history,
          :changeset, :note, :new_note, :query], :browse
     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 [:search, :search_latlon, :search_ca_postcode, :search_osm_nominatim,
          :search_geonames, :search_osm_nominatim_reverse, :search_geonames_reverse], :geocoder
     can [:finish, :embed], :export
     can [:search, :search_latlon, :search_ca_postcode, :search_osm_nominatim,
          :search_geonames, :search_osm_nominatim_reverse, :search_geonames_reverse], :geocoder


@@ -16,11 +16,14 @@ class Ability
     if Settings.status != "database_offline"
       can [:index, :feed], Changeset
       can :index, ChangesetComment
     if Settings.status != "database_offline"
       can [:index, :feed], Changeset
       can :index, ChangesetComment

+      can [:confirm, :confirm_resend, :confirm_email], :confirmation

       can [:index, :rss, :show, :comments], DiaryEntry
       can [:index, :rss, :show, :comments], DiaryEntry

-      can [:mine], Note
+      can [:index], Note
+      can [:lost_password, :reset_password], :password

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

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

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

-      can [:terms, :login, :logout, :new, :create, :save, :confirm, :confirm_resend, :confirm_email, :lost_password, :reset_password, :show, :auth_success, :auth_failure], User
+      can [:terms, :new, :create, :save,  :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, :blocks_on, :blocks_by], UserBlock
       can [:index, :show], Node
       can [:index, :show, :full, :ways_for_node], Way


@@ -36,10 +39,16 @@ class Ability
 
       if Settings.status != "database_offline"
         can [:index, :new, :create, :show, :edit, :update, :destroy], ClientApplication
 
       if Settings.status != "database_offline"
         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 [:show], :dashboard

         can [:new, :create, :edit, :update, :comment, :subscribe, :unsubscribe], DiaryEntry
         can [:make_friend, :remove_friend], Friendship
         can [:new, :create, :reply, :show, :inbox, :outbox, :mark, :destroy], Message
         can [:close, :reopen], Note
         can [:new, :create, :edit, :update, :comment, :subscribe, :unsubscribe], DiaryEntry
         can [:make_friend, :remove_friend], Friendship
         can [:new, :create, :reply, :show, :inbox, :outbox, :mark, :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 [:new, :create], Report
         can [:mine, :new, :create, :edit, :update, :destroy], Trace
         can [:account, :go_public], User


@@ -56,7 +65,7 @@ class Ability
           can [:hide, :unhide, :hidecomment, :unhidecomment], DiaryEntry
           can [:index, :show, :resolve, :ignore, :reopen], Issue
           can :create, IssueComment
           can [:hide, :unhide, :hidecomment, :unhidecomment], DiaryEntry
           can [:index, :show, :resolve, :ignore, :reopen], Issue
           can :create, IssueComment

-          can [:set_status, :delete, :index], User
+          can [:set_status, :destroy, :index], User

           can [:grant, :revoke], UserRole
         end
       end
           can [:grant, :revoke], UserRole
         end
       end