0
@@ -76,15 +76,11 @@ class Admin::ArticlesController < Admin::BaseController
0
   # xhr baby
0
   # needs some restful lovin'
0
   def approve
0
-    @comment = @article.unapproved_comments.find(params[:comment])
0
-    @comment.approved = true
0
-    @comment.save
0
+    @comment = @article.unapproved_comments.approve(params[:comment])
0
   end
0
 
0
   def unapprove
0
-    @comment = @article.comments.find(params[:comment])
0
-    @comment.approved = false
0
-    @comment.save
0
+    @comment = @article.comments.unapprove(params[:comment])
0
     render :action => 'approve'
0
   end
0
   

0
@@ -9,8 +9,8 @@ class Admin::OverviewController < Admin::BaseController
0
     @users = User.find(:all)
0
     @events, @todays_events, @yesterdays_events = [], [], []
0
     today, yesterday = Time.now.to_date, 1.day.ago.to_date
0
-    @articles = @site.articles.find(:all, :include => :all_comments, :conditions => ['all_comments_contents.id is not null and all_comments_contents.approved = ?', false])
0
-    @articles.sort! { |x,y| y.comments.size <=> y.comments.size }
0
+    @articles = @site.articles.find(:all, :include => :unapproved_comments, :conditions => ['unapproved_comments_contents.id is not null and unapproved_comments_contents.approved = ?', false])
0
+    @articles.sort! { |x,y| y.unapproved_comments.size <=> y.unapproved_comments.size }
0
     @site.events.find(:all, :order => 'events.created_at DESC', :include => [:article, :user], :limit => 50).each do |event|
0
       case event.created_at.to_date
0
         when today     then @todays_events

0
@@ -5,14 +5,14 @@ class ApplicationController < ActionController::Base
0
   before_filter :load_site
0
   #before_filter :set_cache_root
0
   helper_method :site
0
-  attr_reader :site
0
+  attr_reader   :site
0
 
0
   def render_liquid_template_for(template_type, assigns = {})
0
     headers["Content-Type"] ||= 'text/html; charset=utf-8'
0
 
0
     unless assigns['article']
0
       self.cached_references += assigns['articles']
0
-      assigns['articles']     = assigns['articles'].collect { |a| a.to_liquid }
0
+      assigns['articles']     = assigns['articles'].collect &:to_liquid
0
     end
0
     
0
     assigns.update 'site' => site.to_liquid

0
@@ -1,4 +1,6 @@
0
 module Admin::ArticlesHelper
0
+  FILTER_TYPES = %w(approved unapproved) unless const_defined?(:FILTER_TYPES)
0
+
0
   def status_icon
0
     @status_icon ||= { :unpublished => %w(orange bstop.gif),
0
                        :pending     => %w(yellow document.gif),
0
@@ -15,6 +17,10 @@ module Admin::ArticlesHelper
0
     article.published? ? article.published_at.to_s(:long) : "not published"
0
   end
0
 
0
+  def valid_filter?(filter = params[:filter])
0
+    FILTER_TYPES.include? filter
0
+  end
0
+
0
   # Buttons like draft_button_tag, save_button_tag
0
   # set the name attr of the submit so we can tell which one they clicked on.
0
   [:draft, :save, :create].each do |button|

0
@@ -17,11 +17,39 @@ class Article < Content
0
   has_many :sections, :through => :assigned_sections, :order => 'sections.name'
0
   has_many :events,   :order => 'created_at desc'
0
   with_options :order => 'created_at',:class_name => 'Comment' do |comment|
0
-    comment.has_many :comments,            :conditions => ['contents.approved = ?', true]
0
-    comment.has_many :unapproved_comments, :conditions => ['contents.approved = ?', false]
0
+    comment.has_many :comments,            :conditions => ['contents.approved = ?', true]  do
0
+      def unapprove(id)
0
+        returning find(id) do |comment|
0
+          comment.approved = false
0
+          comment.save
0
+        end
0
+      end
0
+    end
0
+    comment.has_many :unapproved_comments, :conditions => ['contents.approved = ?', false] do
0
+      def approve(id)
0
+        returning find(id) do |comment|
0
+          comment.approved = true
0
+          comment.save
0
+        end
0
+      end
0
+    end
0
     comment.has_many :all_comments
0
   end
0
-  
0
+
0
+  class << self
0
+    def approve
0
+      comment = @article.unapproved_comments.find(params[:comment])
0
+      comment.approved = true
0
+      comment.save
0
+    end
0
+    
0
+    def unapprove
0
+      comment = @article.comments.find(params[:comment])
0
+      comment.approved = false
0
+      comment.save
0
+    end
0
+  end
0
+
0
   class << self
0
     def find_by_permalink(year, month, day, permalink, options = {})
0
       from, to = Time.delta(year, month, day)

0
@@ -1,6 +1,7 @@
0
 <!-- begin action nav -->
0
 <div class="round" id="page-nav">
0
   <ul id="act-nav">
0
+    <li><%= link_to 'Edit',                :id => @article, :action => 'edit' %></li>
0
     <li><%= link_to 'All Comments',        :filter => nil %></li>
0
     <li><%= link_to 'Unapproved Comments', :filter => :unapproved %></li>
0
     <li><%= link_to 'Approved Comments',   :filter => :approved %></li>
0
@@ -11,7 +12,7 @@
0
 </div>
0
 <!-- /end action nav -->
0
 
0
-<h2>Comments for '<%=h @article.title %>'</h2>
0
+<h2><%= "#{params[:filter].humanize} " if valid_filter? %>Comments for '<%=h @article.title %>'</h2>
0
 
0
 <% @comments.each do |comment| -%>
0
 <div id="comment-<%= comment.id %>">

0
@@ -42,7 +42,7 @@
0
     <h3>Comments Needing Moderation</h3>
0
     <ul class="slist">
0
     <% @articles.each do |article| -%>
0
-      <li><%= link_to "<strong>(#{article.comments.size})</strong> #{h(article.title)}", :controller => 'articles', :action => 'comments', :id => article.id, :filter => :unapproved %></li>
0
+      <li><%= link_to "<strong>(#{article.unapproved_comments.size})</strong> #{h(article.title)}", :controller => 'articles', :action => 'comments', :id => article.id, :filter => :unapproved %></li>
0
     <% end -%>
0
     </ul>
0
   </div>

0
@@ -79,7 +79,7 @@
0
     <script type="text/javascript" language="javascript" charset="utf-8">
0
     // <![CDATA[
0
      //new Asset.Manager();
0
-     new Control.Resizer('main', 'sbar', {handle: 'sbar-handle'});
0
+    //new Control.Resizer('main', 'sbar', {handle: 'sbar-handle'});
0
     // ]]>
0
     </script>
0
   </body>