Switched to CanCan

1 files changed, 11 insertions, 5 deletions

diff --git a/app/controllers/inboxes/messages_controller.rb b/app/controllers/inboxes/messages_controller.rb
index 1c63221..4089b13 100644
--- a/app/controllers/inboxes/messages_controller.rb
+++ b/app/controllers/inboxes/messages_controller.rb
@@ -1,10 +1,10 @@
 class Inboxes::MessagesController < Inboxes::BaseController
+  # before_filter :init_discussion
+  # load_and_authorize_resource
+  load_and_authorize_resource :discussion
+  load_resource :message, :through => :discussion, :shallow => true
   
   def create
-    @discussion = Discussion.find(params[:discussion_id])
-    redirect_to root_url, :notice => t("inboxes.discussions.can_not_participate") unless @discussion.can_participate?(current_user)
-    
-    @message = Message.new(params[:message])
     @message.user = current_user
     @message.discussion = @discussion
     @message.save
@@ -14,5 +14,11 @@ class Inboxes::MessagesController < Inboxes::BaseController
       format.js
     end
   end
-  
+
+  # private
+  # 
+  # def init_and_check_permissions
+  #   @discussion = Discussion.find(params[:discussion_id])
+  #   redirect_to discussions_url, :notice => t("inboxes.discussions.can_not_participate") unless @discussion.can_participate?(current_user)
+  # end
 end