aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/inboxes/messages_controller.rb
diff options
context:
space:
mode:
authorKir Shatrov2011-12-14 01:01:23 -0800
committerKir Shatrov2011-12-14 01:01:23 -0800
commit50a241e922ff4b58b3fc3e52162f4e199e1fae3d (patch)
treec765206549958d0642698c891ed6c840805277bc /app/controllers/inboxes/messages_controller.rb
parent58ebf1bc9762a4fc05ecae776253560026b5b030 (diff)
parentc94547a6bab514e6df816e105f17311ba2ce73c9 (diff)
downloadinboxes-50a241e922ff4b58b3fc3e52162f4e199e1fae3d.tar.bz2
Merge pull request #6 from pronix/master
Readme fix
Diffstat (limited to 'app/controllers/inboxes/messages_controller.rb')
-rw-r--r--app/controllers/inboxes/messages_controller.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/inboxes/messages_controller.rb b/app/controllers/inboxes/messages_controller.rb
index 4089b13..697592a 100644
--- a/app/controllers/inboxes/messages_controller.rb
+++ b/app/controllers/inboxes/messages_controller.rb
@@ -3,12 +3,12 @@ class Inboxes::MessagesController < Inboxes::BaseController
# load_and_authorize_resource
load_and_authorize_resource :discussion
load_resource :message, :through => :discussion, :shallow => true
-
+
def create
@message.user = current_user
@message.discussion = @discussion
@message.save
-
+
respond_to do |format|
format.html { redirect_to @message.discussion }
format.js
@@ -16,7 +16,7 @@ class Inboxes::MessagesController < Inboxes::BaseController
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)