Refactor site#welcome to use abilities instead of require_user

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

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 59b1c5ec3e68ebda8edc6e1bddd68d13bfec82a6..3ff46656899c0d45214ef1eb7e72f24e86705ec8 100644 (file)
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -3,20 +3,21 @@
 class Ability
   include CanCan::Ability
 
-  def initialize(user, token)
+  def initialize(user)
     can :index, :site
-    can [:permalink, :edit, :help, :fixthemap, :offline, :export, :about, :preview, :copyright, :key, :id, :welcome], :site
+    can [:permalink, :edit, :help, :fixthemap, :offline, :export, :about, :preview, :copyright, :key, :id], :site
 
-    can [:list, :rss, :view, :comments], DiaryEntry
+    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
-      can :weclome, :site
+      can :welcome, :site
 
       can [:create, :edit, :comment, :subscribe, :unsubscribe], DiaryEntry
 
-      if user.administrator?
-        can [:hide, :hidecomment], [DiaryEntry, DiaryComment]
-      end
+      can [:hide, :hidecomment], [DiaryEntry, DiaryComment] if user.administrator?
     end
     # Define abilities for the passed in user here. For example:
     #
@@ -45,8 +46,4 @@ class Ability
     # See the wiki for details:
     # https://github.com/CanCanCommunity/cancancan/wiki/Defining-Abilities
   end
-
-  def has_capability?(token, cap)
-    token && token.read_attribute(cap)
-  end
 end