Merge branch 'master' into cancancan

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

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 864225e8e83a151e737a8246a4d610c2723fae4b..f55f19e4ea7e2d918e81ee4a95f66990dea9b530 100644 (file)
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -1,13 +1,32 @@
+# frozen_string_literal: true
+

 class Ability
   include CanCan::Ability
 
   def initialize(user)
 class Ability
   include CanCan::Ability
 
   def initialize(user)

-    can :index, :site
-    can [:permalink, :edit, :help, :fixthemap, :offline, :export, :about, :preview, :copyright, :key, :id, :welcome], :site
+    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

 
     if user
 
     if user

-      can :weclome, :site
+      can :welcome, :site
+      can [:create, :edit, :comment, :subscribe, :unsubscribe], DiaryEntry
+      can [:new, :create], Report
+      can [:read, :read_one, :update, :update_one, :delete_one], UserPreference
+
+      if user.moderator?
+        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
+      end

     end
     end

+

     # Define abilities for the passed in user here. For example:
     #
     #   user ||= User.new # guest user (not logged in)
     # Define abilities for the passed in user here. For example:
     #
     #   user ||= User.new # guest user (not logged in)