diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-09 18:15:06 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-09 18:15:06 +0100 |
| commit | 211fe84dc40d97df8aa8724906d9170ed4f78477 (patch) | |
| tree | 30f5face0950bc7cceea1d2d3d01a43bd4e1a044 /app/controllers/admin_request_controller.rb | |
| parent | 54281fd50c3271835a54ab4bc08d40da09d643ee (diff) | |
Revert "Merge remote-tracking branch 'henare_github/patch-1'"
Mistakenly merged into master. Please note that we'll want to merge this work into master on the next release, at which point we'll want to revert this reversion in order that the changes are properly re-applied.
This reverts commit 54281fd50c3271835a54ab4bc08d40da09d643ee, reversing
changes made to 793ca358c37458e6cc4385d2366621aaee93a25e.
Diffstat (limited to 'app/controllers/admin_request_controller.rb')
| -rw-r--r-- | app/controllers/admin_request_controller.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index 53ff2957b..7cf23e61e 100644 --- a/app/controllers/admin_request_controller.rb +++ b/app/controllers/admin_request_controller.rb @@ -71,7 +71,6 @@ class AdminRequestController < AdminController old_allow_new_responses_from = @info_request.allow_new_responses_from old_handle_rejected_responses = @info_request.handle_rejected_responses old_tag_string = @info_request.tag_string - old_comments_allowed = @info_request.comments_allowed @info_request.title = params[:info_request][:title] @info_request.prominence = params[:info_request][:prominence] @@ -82,7 +81,6 @@ class AdminRequestController < AdminController @info_request.allow_new_responses_from = params[:info_request][:allow_new_responses_from] @info_request.handle_rejected_responses = params[:info_request][:handle_rejected_responses] @info_request.tag_string = params[:info_request][:tag_string] - @info_request.comments_allowed = params[:info_request][:comments_allowed] == "true" ? true : false if @info_request.valid? @info_request.save! @@ -94,8 +92,7 @@ class AdminRequestController < AdminController :old_awaiting_description => old_awaiting_description, :awaiting_description => @info_request.awaiting_description, :old_allow_new_responses_from => old_allow_new_responses_from, :allow_new_responses_from => @info_request.allow_new_responses_from, :old_handle_rejected_responses => old_handle_rejected_responses, :handle_rejected_responses => @info_request.handle_rejected_responses, - :old_tag_string => old_tag_string, :tag_string => @info_request.tag_string, - :old_comments_allowed => old_comments_allowed, :tag_string => @info_request.comments_allowed + :old_tag_string => old_tag_string, :tag_string => @info_request.tag_string }) # expire cached files expire_for_request(@info_request) |