0
@@ -15,9 +15,8 @@ module Admin::ArticlesHelper
0
   end
0
 
0
   def published_at_for(article)
0
-    return 'not published' unless article
0
-    format = article.published_at.year == Time.now.utc.year ? :plain : :standard
0
-    article.published? ? utc_to_local(article.published_at).to_s(format) : "not published"
0
+    return 'not published' unless article && article.published?
0
+    utc_to_local(article.published_at).to_s(article.published_at.year == Time.now.utc.year ? :plain : :standard)
0
   end
0
 
0
   def valid_filter?(filter = params[:filter])

0
@@ -13,11 +13,11 @@ class Article < Content
0
     end
0
   end
0
 
0
-  has_many :assigned_sections
0
+  has_many :assigned_sections, :dependent => :delete_all
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]  do
0
+  has_many :events,   :order => 'created_at desc', :dependent => :delete_all
0
+  with_options :order => 'created_at', :class_name => 'Comment' do |comment|
0
+    comment.has_many :comments,            :conditions => ['contents.approved = ?', true], :dependent => :delete_all  do
0
       def unapprove(id)
0
         returning find(id) do |comment|
0
           comment.approved = false