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

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

diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index 5e8ef997fb8523e19f72800b027b43ef452d0933..d91b7a2e738015a163671fb1674107fc27c84152 100644 (file)
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -6,74 +6,59 @@ class Ability
   def initialize(user)
     can [:relation, :relation_history, :way, :way_history, :node, :node_history,
          :changeset, :note, :new_note, :query], :browse
   def initialize(user)
     can [:relation, :relation_history, :way, :way_history, :node, :node_history,
          :changeset, :note, :new_note, :query], :browse

-    can :show, :capability
-    can :index, :change
-    can [:index, :feed, :show, :download, :query], Changeset
-    can :index, ChangesetComment

     can :search, :direction
     can [:index, :permalink, :edit, :help, :fixthemap, :offline, :export, :about, :preview, :copyright, :key, :id], :site
     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 [:finish, :embed], :export
     can [:search, :search_latlon, :search_ca_postcode, :search_osm_nominatim,
          :search_geonames, :search_osm_nominatim_reverse, :search_geonames_reverse], :geocoder

-    can :index, :map
-    can [:index, :create, :comment, :feed, :show, :search, :mine], Note

     can [:token, :request_token, :access_token, :test_request], :oauth
     can [:token, :request_token, :access_token, :test_request], :oauth

-    can :show, :permission
-    can [:index, :show], Redaction
-    can [:search_all, :search_nodes, :search_ways, :search_relations], :search
-    can [:trackpoints], :swf
-    can [:index, :show, :data, :georss, :picture, :icon], Trace
-    can :index, Tracepoint
-    can [:terms, :api_users, :login, :logout, :new, :create, :save, :confirm, :confirm_resend, :confirm_email, :lost_password, :reset_password, :show, :api_read, :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
+
+    if Settings.status != "database_offline"
+      can [:index, :feed], Changeset
+      can :index, ChangesetComment
+      can [:index, :rss, :show, :comments], DiaryEntry
+      can [:index], 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
 
     if user
       can :welcome, :site

-      can [:index, :new, :create, :show, :edit, :update, :destroy], ClientApplication
-      can [:create, :edit, :comment, :subscribe, :unsubscribe], DiaryEntry
-      can [:new, :create, :reply, :show, :inbox, :outbox, :mark, :destroy], Message
-      can [:close, :reopen], Note

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

-      can [:new, :create], Report
-      can [:mine, :new, :create, :edit, :update, :delete, :api_create, :api_read, :api_update, :api_delete, :api_data], Trace
-      can [:account, :go_public, :make_friend, :remove_friend, :api_details, :api_gpx_files], User
-      can [:read, :read_one, :update, :update_one, :delete_one], UserPreference

 
 

-      if user.terms_agreed?
-        can [:create, :update, :upload, :close, :subscribe, :unsubscribe, :expand_bbox], Changeset
-        can :create, ChangesetComment
-        can [:create, :update, :delete], Node
-        can [:create, :update, :delete], Way
-        can [:create, :update, :delete], Relation
-      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 [:make_friend, :remove_friend], Friendship
+        can [:new, :create, :reply, :show, :inbox, :outbox, :mark, :destroy], Message
+        can [:close, :reopen], Note
+        can [:new, :create], Report
+        can [:mine, :new, :create, :edit, :update, :destroy], Trace
+        can [:account, :go_public], User

 
 

-      if user.moderator?
-        can [:destroy, :restore], ChangesetComment
-        can [:index, :show, :resolve, :ignore, :reopen], Issue
-        can :create, IssueComment
-        can :destroy, Note
-        can [:new, :create, :edit, :update, :destroy], Redaction
-        can [:new, :edit, :create, :update, :revoke], UserBlock
-        if user.terms_agreed?
-          can :redact, OldNode
-          can :redact, OldWay
-          can :redact, OldRelation
+        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
         end

-      end

 
 

-      if user.administrator?
-        can [:hide, :hidecomment], [DiaryEntry, DiaryComment]
-        can [:index, :show, :resolve, :ignore, :reopen], Issue
-        can :create, IssueComment
-        can [:set_status, :delete, :index], User
-        can [:grant, :revoke], UserRole
+        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