@@ -34,7 +34,7 @@ class CommentsController < ApplicationController unless params[:parent_id].blank? @parent_comment = Comment.find(params[:parent_id]) %w{ commentable_id commentable_type commentable_private }.each do |attr| - params[attr.to_sym] = @parent_comment.send(attr.to_sym) + params[attr.to_sym] = @parent_comment.send(attr.to_sym).to_s end @comment.title ||= "Re: #{@parent_comment.title.gsub(/^Re:\s?/i, '')}" @comment.tag_list = @parent_comment.raw_tag_list app/controllers/comments_controller.rb @@ -23,4 +23,12 @@ module CommentsHelper wrapped_lines_array.collect! { |wrapped_line| "&gt; #{wrapped_line}" } wrapped_lines_array.join('<br />') end + + # We need to handle new comments, when the form has + # been submitted, and when editing a comment. + def comment_private?(comment) + (params[:commentable_private] && params[:commentable_private].to_bool) || + (params[:comment] && params[:comment][:commentable_private] && params[:comment][:commentable_private].to_bool) || + (comment.private?) + end end app/helpers/comments_helper.rb @@ -15,8 +15,7 @@ <%= hidden_field_tag "relate_to_topic", params[:relate_to_topic] %> <% end %> - <% commentable_private = params[:commentable_private] || (params[:comment] && params[:comment][:commentable_private]) || (@comment.private? ? '1' : '0') %> - <%= hidden_field_tag 'comment[commentable_private]', commentable_private %> + <%= hidden_field_tag 'comment[commentable_private]', (comment_private?(@comment) ? '1' : '0') %> <div class="form-element"> <label for="comment_title"><%=t 'comments.form.title' %></label> @@ -74,7 +73,7 @@ <% end %> <% if show_notification_controls?(@current_basket) %> - <div id="skip_email_notification_div"<%= "style='display:none;'" unless commentable_private %>> + <div id="skip_email_notification_div"<%= "style='display:none;'" unless comment_private?(@comment) %>> <div class="form-element"> <label for="comment_skip_email_notification"> <%=t 'comments.form.skip_email_notification', app/views/comments/_form.rhtml @@ -36,10 +36,10 @@ class String URI.decode(self) end - # converts "true", "false", and "nil" into their appropriate boolean/NilClass values + # converts "true", "1", "false", "0" and "nil" into their appropriate boolean/NilClass values def to_bool - return true if self == "true" - return false if self == "false" + return true if self == "true" || self == "1" + return false if self == "false" || self == "0" return nil if self == "nil" return self end config/initializers/all_extensions.rb 32b0e9d9a39eb76689e1f6e72d55aa576aec6813 Kieran Pilkington kieran@katipo.co.nz http://github.com/kete/kete/commit/4f7ba2e8abffdddfb6aee1297bf114bb23a5d023 4f7ba2e8abffdddfb6aee1297bf114bb23a5d023 2009-11-08T14:24:02-08:00 2009-11-08T14:24:02-08:00 refinement: Supporting more cases of 1 (true) and 0 (false), and extracing view logic into comment helper. 4072084131595d0f6cafcaf4bf512793ecff9f3b Kieran Pilkington kieran@katipo.co.nz