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

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

diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index f55f19e4ea7e2d918e81ee4a95f66990dea9b530..c34f357a97a41b2febfbdb7fa1b0a505ded8e3aa 100644 (file)
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -4,26 +4,60 @@ class Ability
   include CanCan::Ability
 
   def initialize(user)
+    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, :rss, :show, :comments], DiaryEntry
+    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
+
+    if Settings.status != "database_offline"
+      can [:index, :feed], Changeset
+      can :index, ChangesetComment
+      can [:index, :rss, :show, :comments], DiaryEntry
+      can [:mine], Note
+      can [:index, :show], Redaction
+      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 [: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
+    end
 
     if user
       can :welcome, :site
-      can [:create, :edit, :comment, :subscribe, :unsubscribe], DiaryEntry
-      can [:new, :create], Report
-      can [:read, :read_one, :update, :update_one, :delete_one], UserPreference
+      can [:revoke, :authorize], :oauth
 
-      if user.moderator?
-        can [:index, :show, :resolve, :ignore, :reopen], Issue
-        can :create, IssueComment
-      end
+      if Settings.status != "database_offline"
+        can [:index, :new, :create, :show, :edit, :update, :destroy], ClientApplication
+        can [:new, :create, :edit, :update, :comment, :subscribe, :unsubscribe], DiaryEntry
+        can [:new, :create, :reply, :show, :inbox, :outbox, :mark, :destroy], Message
+        can [:close, :reopen], Note
+        can [:new, :create], Report
+        can [:mine, :new, :create, :edit, :update, :delete], Trace
+        can [:account, :go_public, :make_friend, :remove_friend], User
+
+        if user.moderator?
+          can [:hide, :hidecomment], DiaryEntry
+          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
 
-      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, :delete, :index], User
+          can [:grant, :revoke], UserRole
+        end
       end
     end