aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/comment_controller.rb
diff options
context:
space:
mode:
authorDavid Cabo <david@calibea.com>2012-05-28 12:58:02 +0200
committerDavid Cabo <david@calibea.com>2012-05-28 12:58:02 +0200
commitbc681f7270f5ddc40279981a15a0a7c7af250293 (patch)
tree5df68fe9a0a756d9821c560079271ed363bd3f18 /app/controllers/comment_controller.rb
parentba29eab41f51f3f489be7c5daf6d28449eab944f (diff)
parentacde8a57e087d3058b8539e04c12e790866f8451 (diff)
Merge branch 'develop' of github.com:sebbacon/alaveteli into develop
Diffstat (limited to 'app/controllers/comment_controller.rb')
-rw-r--r--app/controllers/comment_controller.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/comment_controller.rb b/app/controllers/comment_controller.rb
index 86d5b0a06..d9cd002dd 100644
--- a/app/controllers/comment_controller.rb
+++ b/app/controllers/comment_controller.rb
@@ -9,14 +9,14 @@
class CommentController < ApplicationController
before_filter :check_read_only, :only => [ :new ]
protect_from_forgery :only => [ :new ]
-
+
def new
if params[:type] == 'request'
@info_request = InfoRequest.find_by_url_title(params[:url_title])
@track_thing = TrackThing.create_track_for_request(@info_request)
if params[:comment]
@comment = Comment.new(params[:comment].merge({
- :comment_type => 'request',
+ :comment_type => 'request',
:user => @user
}))
end
@@ -38,7 +38,7 @@ class CommentController < ApplicationController
# Default to subscribing to request when first viewing form
params[:subscribe_to_request] = true
end
-
+
# See if values were valid or not
if !params[:comment] || !@existing_comment.nil? || !@comment.valid? || params[:reedit]
render :action => 'new'