Use CanCanCan for messages controller

diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index 1fcf6cbeef9fc1b5dc657e43811d9044d1342be7..c4ea4ef8f83f8694fc48e067bfb5982357dc89fe 100644 (file)
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -17,6 +17,7 @@ class Ability
     if user
       can :welcome, :site
       can [:create, :edit, :comment, :subscribe, :unsubscribe], DiaryEntry
     if user
       can :welcome, :site
       can [:create, :edit, :comment, :subscribe, :unsubscribe], DiaryEntry

+      can [:new, :create, :reply, :show, :inbox, :outbox, :mark, :destroy], Message

       can [:close, :reopen], Note
       can [:new, :create], Report
       can [:account, :go_public, :make_friend, :remove_friend, :api_details, :api_gpx_files], User
       can [:close, :reopen], Note
       can [:new, :create], Report
       can [:account, :go_public, :make_friend, :remove_friend, :api_details, :api_gpx_files], User

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index c93c998f02655e60bee8ea202853005a0ee61d91..dce0099e5b68caeceb12f1f5fa41865d4c3db0b9 100644 (file)
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -3,7 +3,9 @@ class MessagesController < ApplicationController
 
   before_action :authorize_web
   before_action :set_locale
 
   before_action :authorize_web
   before_action :set_locale

-  before_action :require_user
+
+  authorize_resource
+

   before_action :lookup_user, :only => [:new, :create]
   before_action :check_database_readable
   before_action :check_database_writable, :only => [:new, :create, :reply, :mark, :destroy]
   before_action :lookup_user, :only => [:new, :create]
   before_action :check_database_readable
   before_action :check_database_writable, :only => [:new, :create, :reply, :mark, :destroy]