0
@@ -15,7 +15,7 @@ class ArticleSweeper < ActionController::Caching::Sweeper
0
   end
0
 
0
   def after_save(record)
0
-    if record.is_a?(Article)
0
+    if @event && record.is_a?(Article)
0
       @event.update_attributes :title => record.title, :body => record.body, :article => record, :user => record.updater, :site => record.site
0
       expire_overview_feed!
0
     end

0
@@ -9,7 +9,7 @@ class Admin::ArticlesController < Admin::BaseController
0
   before_filter :check_for_new_draft,  :only => [:create, :update]
0
   before_filter :convert_times_to_utc, :only => [:create, :update]
0
   
0
-  before_filter :find_site_article, :only => [:update, :comments, :approve, :unapprove]
0
+  before_filter :find_site_article, :only => [:edit, :update, :comments, :approve, :unapprove, :destroy]
0
   before_filter :load_sections, :only => [:new, :edit]
0
 
0
   def index
0
@@ -33,7 +33,6 @@ class Admin::ArticlesController < Admin::BaseController
0
   end
0
 
0
   def edit
0
-    @article = site.articles.find(params[:id])
0
     @version = params[:version] ? @article.find_version(params[:version]) : @article
0
     [:published_at, :expire_comments_at].each do |attr|
0
       @version.send("#{attr}=", utc_to_local(@version.send(attr) || Time.now.utc))
0
@@ -61,6 +60,13 @@ class Admin::ArticlesController < Admin::BaseController
0
     end
0
   end
0
 
0
+  def destroy
0
+    @article.destroy
0
+    render :update do |page|
0
+      page.redirect_to :action => 'index'
0
+    end
0
+  end
0
+
0
   def comments
0
     @comments = 
0
       case params[:filter]

0
@@ -2,7 +2,7 @@
0
 <% content_for :action_nav do %>
0
 <div id="page-nav">
0
   <ul id="act-nav" class="clear">
0
-    <li><%= link_to 'Delete this article', {:action => 'destroy', :id => @article}, :confirm => 'Are you sure you want to delete this article?' %></li>
0
+    <li><%= link_to_remote 'Delete this article', :url => {:action => 'destroy', :id => @article}, :confirm => 'Are you sure you want to delete this article?' %></li>
0
     <li id="select">
0
       <a class="trigger" id="cog" href="#">&nbsp;</a>
0
       <div id="optgroup" style="display: none">

0
@@ -3,7 +3,7 @@
0
 # In the development environment your application's code is reloaded on
0
 # every request.  This slows down response time but is perfect for development
0
 # since you don't have to restart the webserver when you make code changes.
0
-config.cache_classes     = true
0
+config.cache_classes     = false
0
 
0
 # Log error messages when you accidentally call methods on nil.
0
 config.whiny_nils        = true