Only check IP addresses for anonymous note comments

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

diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index f55f19e4ea7e2d918e81ee4a95f66990dea9b530..707272182e81adff11236e0c60d2c36ddcc20eb4 100644 (file)
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -4,26 +4,37 @@ class Ability
   include CanCan::Ability
 
   def initialize(user)
   include CanCan::Ability
 
   def initialize(user)

+    can :index, ChangesetComment

     can [:index, :permalink, :edit, :help, :fixthemap, :offline, :export, :about, :preview, :copyright, :key, :id], :site
     can [:index, :rss, :show, :comments], DiaryEntry
     can [:search, :search_latlon, :search_ca_postcode, :search_osm_nominatim,
          :search_geonames, :search_osm_nominatim_reverse, :search_geonames_reverse], :geocoder
     can [:index, :permalink, :edit, :help, :fixthemap, :offline, :export, :about, :preview, :copyright, :key, :id], :site
     can [:index, :rss, :show, :comments], DiaryEntry
     can [:search, :search_latlon, :search_ca_postcode, :search_osm_nominatim,
          :search_geonames, :search_osm_nominatim_reverse, :search_geonames_reverse], :geocoder

+    can [:index, :create, :comment, :feed, :show, :search, :mine], Note
+    can [:index, :show], Redaction
+    can [:index, :show, :blocks_on, :blocks_by], UserBlock

 
     if user
       can :welcome, :site
 
     if user
       can :welcome, :site

+      can :create, ChangesetComment

       can [:create, :edit, :comment, :subscribe, :unsubscribe], DiaryEntry
       can [:create, :edit, :comment, :subscribe, :unsubscribe], DiaryEntry

+      can [:close, :reopen], Note

       can [:new, :create], Report
       can [:read, :read_one, :update, :update_one, :delete_one], UserPreference
 
       if user.moderator?
       can [:new, :create], Report
       can [:read, :read_one, :update, :update_one, :delete_one], UserPreference
 
       if user.moderator?

+        can [:destroy, :restore], ChangesetComment

         can [:index, :show, :resolve, :ignore, :reopen], Issue
         can :create, IssueComment
         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

       end
 
       if user.administrator?
         can [:hide, :hidecomment], [DiaryEntry, DiaryComment]
         can [:index, :show, :resolve, :ignore, :reopen], Issue
         can :create, IssueComment
       end
 
       if user.administrator?
         can [:hide, :hidecomment], [DiaryEntry, DiaryComment]
         can [:index, :show, :resolve, :ignore, :reopen], Issue
         can :create, IssueComment

+        can [:grant, :revoke], UserRole

       end
     end
 
       end
     end