@@ -43,12 +43,13 @@ class Admin::CommentsController < ApplicationController TextFilter.descendants.each do |filter| @comment.content_html = filter.filter(@comment.content) if filter.filter_name == @comment.filter_id end - @comment.update_attributes(params[:comment]) - Radiant::Cache.clear + @comment.update_attributes!(params[:comment]) + clear_cache flash[:notice] = "Comment Saved" redirect_to :action => :index rescue Exception => e - flash[:notice] = "There was an error saving the comment" + flash[:notice] = "There was an error saving the comment: #{e.message}" + render :action => :edit end end app/controllers/admin/comments_controller.rb @@ -1,44 +1,36 @@ -<div id="comment_form_container"> - - <table border="0"> - - <tr> - <th><label for="comment_author">Comment Author Name</label></th> - <td><%= f.text_field :author, :class => "regular" %></td> - </tr> - - <tr> - <th><label for="comment_author_url">Comment Author URL</label></th> - <td><%= f.text_field :author_url, :class => "regular" %></td> - </tr> - - <tr> - <th><label for="comment_author_email">Comment Author Email</label></th> - <td><%= f.text_field :author_email, :class => "regular" %></td> - </tr> - - <tr> - <th><label for="comment">Comment</label></th> - <td><%= f.text_area :content, :rows => 10, :class => "regular" %></td> - </tr> - - <tr> - <th> - <label for="comment_filter_id">Filter</label> - </th> - <td> - <%= f.select :filter_id, [['<none>', '']] + TextFilter.descendants.map { |s| s.filter_name }.sort %> - - - </td> - </tr> - - </table> - - <%= submit_tag("Save comment", :class => "button", :id => "comment_submit_button") %> - - <%= f.hidden_field :page_id %> - - - +<% if Comment.spam_filter == SimpleSpamFilter %> + <div style="display:none"> + <%= f.hidden_field :spam_answer, :value => "hemidemisemiquaver" %> + <%= f.hidden_field :valid_spam_answer, :value => Digest::MD5.hexdigest("hemidemisemiquaver") %> + </div> +<% end %> +<div id="comment_form_container" class="form-area"> + <div class="row"> + <p> + <label for="comment_author">Author</label><br/> + <%= f.text_field :author %> + </p> + <p> + <label for="comment_author_url">URL</label><br/> + <%= f.text_field :author_url %> + </p> + </div> + <br style="clear: both" /> + <p> + <label for="comment_author_email">Email</label><br/> + <%= f.text_field :author_email %> + </p> + <p> + <label for="comment_content">Comment</label><br /> + <%= f.text_area :content, :rows => 10, :cols => 72, :class => "textarea"%> + </p> + <p> + <label for="comment_filter_id">Filter</label> + <%= f.select :filter_id, [['<none>', '']] + TextFilter.descendants.map { |s| s.filter_name }.sort %> + </p> </div> +<p class="buttons"> + <%= save_model_button(@comment) %> + or + <%= link_to "Cancel", :back %> +</p> \ No newline at end of file app/views/admin/comments/_form.rhtml @@ -1,5 +1,5 @@ -<h1>Edit comment by <%= @comment.author %></h1> +<h1>Edit Comment on "<%= escape_once(@comment.page.title) %>"</h1> -<% form_for :comment, @comment, :url => admin_comment_path(@comment), :html => {:method => :put} do |f| %> +<% form_for [:admin, @comment] do |f| %> <%= render :partial => "form", :locals => {:f => f} %> <% end %> app/views/admin/comments/edit.rhtml 789e28ffb58461524704a650e145ec60693567b9 Sean Cribbs seancribbs@gmail.com http://github.com/artofmission/radiant-comments/commit/eb1dea616d9e1de7914b5dbe6d477812785d85d0 eb1dea616d9e1de7914b5dbe6d477812785d85d0 2009-08-20T09:54:27-07:00 2009-08-20T09:54:27-07:00 Improve comment editing UI, allow saving when using simple spam filter. 596454cc11b6796fe51fe57cd7ac8c29551143e3 Sean Cribbs seancribbs@gmail.com