spec/models/comment_spec.rb @@ -62,6 +62,7 @@ class Admin::ArticlesController < Admin::BaseController def destroy @article.destroy + flash[:notice] = "The article: #{@article.title.inspect} was deleted." render :update do |page| page.redirect_to :action => 'index' end app/controllers/admin/articles_controller.rb @@ -55,6 +55,8 @@ class MephistoController < ApplicationController show_article_with 'errors' => @comment.errors.full_messages, 'submitted' => params[:comment] rescue Article::CommentNotAllowed show_article_with 'errors' => ["Commenting has been disabled on this article"] + rescue Comment::Previewing + show_article_with 'errors' => ["Previewing your comment"], 'submitted' => params[:comment] end def dispatch_comment app/controllers/mephisto_controller.rb @@ -19,7 +19,7 @@ class ArticleDrop < BaseDrop end def comments - @comments ||= liquify(*@source.comments.reject(&:new_record?)) + @comments ||= liquify(*@source.comments) # .reject(&:new_record?) <-- show new comments as they're built as a preview end def sections app/drops/article_drop.rb @@ -19,6 +19,10 @@ class CommentDrop < BaseDrop @url ||= absolute_url(@source.site.permalink_for(@source)) end + def new_record + @source.new_record? + end + def author_link @source.author_url.blank? ? "<span>#{@source.author}</span>" : %Q{<a href="#{author_url}">#{@source.author}</a>} end app/drops/comment_drop.rb @@ -12,8 +12,18 @@ class Comment < Content before_destroy :decrement_counter_cache belongs_to :article has_one :event, :dependent => :destroy - attr_accessible :article, :article_id, :user_id, :user, :excerpt, :body, :author, :author_url, :author_email, :author_ip, :updater_id, :updater, :comment_age, :user_agent, :referrer + before_create :check_if_previewing + attr_accessible :article, :article_id, :user_id, :user, :excerpt, :body, :author, :author_url, :author_email, :author_ip, :updater_id, :updater, :comment_age, :user_agent, :referrer, :preview + attr_accessor :preview + class Previewing < StandardError; end + + # If the view sends the "preview" accessor, we raise this + # error so the controller can simply rescue + def check_if_previewing + raise Comment::Previewing if preview + end + def self.find_all_by_section(section, options = {}) find :all, options.update(:conditions => ['contents.approved = ? and assigned_sections.section_id = ?', true, section.id], :select => 'contents.*', :joins => 'INNER JOIN assigned_sections ON assigned_sections.article_id = contents.article_id', @@ -80,7 +90,7 @@ class Comment < Content end def check_comment_expiration - raise Article::CommentNotAllowed unless article.accept_comments? + raise Article::CommentNotAllowed, "#{article.status} does not allow comments" unless article.accept_comments? end def update_counter_cache app/models/comment.rb @@ -44,7 +44,10 @@ <li><%= link_to 'Sections', :controller => '/admin/sections' %></li> <li><%= link_to 'Design', :controller => '/admin/design' %></li> <li><%= link_to "Users", :controller => "users" %></li> + <% if false -%> + hidden because plugins are in for a change <li><%= link_to 'Plugins', :controller => '/admin/plugins' %></li> + <% end -%> <% Mephisto::Plugin.admin_tabs.each do |tab| -%> <li><%= link_to tab.first.to_s.tableize.humanize, tab.last %></li> <% end -%> app/views/layouts/application.rhtml @@ -9,6 +9,8 @@ module Mephisto Thread.current[:comment_form_article] = value end + # Provides the required input, error, and form fields + # TODO: make this more accessible to users (let them mess it up, rather than forcing a structure on them) def render(context) return '' unless self.class.article.accept_comments? result = [] lib/mephisto/liquid/comment_form.rb @@ -19,7 +19,7 @@ module Mephisto map.purge 'admin/articles/comments/purge', :controller => 'admin/comments', :action => 'destroy' map.resources :articles, :path_prefix => 'admin', :controller => 'admin/articles' do |r| - r.resources :comments, :controller => 'admin/comments', :member => { :unapprove => :post, :approve => :post, :edit => :get } + r.resources :comments, :controller => 'admin/comments', :member => { :unapprove => :post, :approve => :post, :edit => :get, :preview => :post } end map.overview 'admin/overview.xml', :controller => 'admin/overview', :action => 'feed' lib/mephisto/routing.rb 963b29301a8e3c6b62557848575422dbad4a9245 rick technoweenie@gmail.com http://github.com/technoweenie/mephisto/commit/b0fadcd7955634ef0fc82c18a8b769c7d9cb89d4 b0fadcd7955634ef0fc82c18a8b769c7d9cb89d4 2008-02-04T09:21:51-08:00 2008-02-04T09:21:51-08:00 host of fixes and added support for comment preview 12a89c5278097f788f6b742fb22a91e21f3bb9cc rick technoweenie@gmail.com