Merge pull request #4184 from AntonKhorev/print

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

diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index b8e21b4867e430d13d1955b2296e78696c249eb3..cdf28bd4fb234e1e1801b5d569fbdc982963a608 100644 (file)
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -5,12 +5,12 @@ class Ability
 
   def initialize(user)
     can [:relation, :relation_history, :way, :way_history, :node, :node_history,
 
   def initialize(user)
     can [:relation, :relation_history, :way, :way_history, :node, :node_history,

-         :changeset, :note, :new_note, :query], :browse
+         :changeset, :query], :browse
+    can [:show, :new], Note

     can :search, :direction
     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 [:finish, :embed], :export

-    can [:search, :search_latlon, :search_ca_postcode, :search_osm_nominatim,
-         :search_geonames, :search_osm_nominatim_reverse, :search_geonames_reverse], :geocoder
+    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 [:token, :request_token, :access_token, :test_request], :oauth
 
     if Settings.status != "database_offline"


@@ -33,16 +33,17 @@ class Ability
       can [:history, :version], OldRelation
     end
 
       can [:history, :version], OldRelation
     end
 

-    if user
+    if user&.active?

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

+      can [:show], :deletion

 
       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
 
       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 [:edit, :update], :account
+        can [:edit, :update, :destroy], :account

         can [:show], :dashboard
         can [:new, :create, :edit, :update, :comment, :subscribe, :unsubscribe], DiaryEntry
         can [:make_friend, :remove_friend], Friendship
         can [:show], :dashboard
         can [:new, :create, :edit, :update, :comment, :subscribe, :unsubscribe], DiaryEntry
         can [:make_friend, :remove_friend], Friendship


@@ -55,7 +56,7 @@ class Ability
         can [:account, :go_public], User
 
         if user.moderator?
         can [:account, :go_public], User
 
         if user.moderator?

-          can [:hide, :hidecomment], DiaryEntry
+          can [:hide, :unhide, :hidecomment, :unhidecomment], DiaryEntry

           can [:index, :show, :resolve, :ignore, :reopen], Issue
           can :create, IssueComment
           can [:new, :create, :edit, :update, :destroy], Redaction
           can [:index, :show, :resolve, :ignore, :reopen], Issue
           can :create, IssueComment
           can [:new, :create, :edit, :update, :destroy], Redaction