Make diary comment creation work again.

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index c74c821c25cac2861790a2e7fe58725a779aba26..8daeac5debc30a823b4ad7ea01c10c00478f8707 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -52,7 +52,7 @@ class DiaryEntryController < ApplicationController
 
   def comment
     @entry = DiaryEntry.find(params[:id])
-    @diary_comment = @entry.diary_comments.build(params[:diary_comment])
+    @diary_comment = @entry.comments.build(params[:diary_comment])
     @diary_comment.user = @user
     if @diary_comment.save
       if @diary_comment.user != @entry.user

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index c6f4eaa12f1e2a38b991122082abe76ed08b7353..20acd962e72d1140f27938e3760e2c82bedfd6e5 100644 (file)
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -2,12 +2,16 @@ class DiaryEntry < ActiveRecord::Base
   belongs_to :user
   belongs_to :language, :foreign_key => 'language_code'
   
-  has_many :diary_comments, :include => :user,
-                            :conditions => {
-                              :users => { :visible => true },
-                              :visible => true
-                            },
-                            :order => "diary_comments.id"
+  has_many :comments, :class_name => "DiaryComment",
+                      :include => :user,
+                      :order => "diary_comments.id"
+  has_many :visible_comments, :class_name => "DiaryComment",
+                              :include => :user,
+                              :conditions => {
+                                :users => { :visible => true },
+                                :visible => true
+                              },
+                              :order => "diary_comments.id"
 
   validates_presence_of :title, :body
   validates_length_of :title, :within => 1..255

diff --git a/app/views/diary_entry/_diary_entry.html.erb b/app/views/diary_entry/_diary_entry.html.erb
index 3e6ee02aabbf2432cdcb7cac6daccc73791f6909..0f4f6c206fd2a0fc2468e492ddbc2413e32d2384 100644 (file)
--- a/app/views/diary_entry/_diary_entry.html.erb
+++ b/app/views/diary_entry/_diary_entry.html.erb
@@ -10,7 +10,7 @@
 |
 <%= link_to t('diary_entry.diary_entry.reply_link'), :controller => 'message', :action => 'new', :display_name => diary_entry.user.display_name, :title => "Re: #{diary_entry.title}" %>
 |
-<%= link_to t('diary_entry.diary_entry.comment_count', :count => diary_entry.diary_comments.count), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'comments' %>
+<%= link_to t('diary_entry.diary_entry.comment_count', :count => diary_entry.visible_comments.count), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'comments' %>
 <% end %>
 <% if @user == diary_entry.user %> 
 | <%= link_to t('diary_entry.diary_entry.edit_link'), :action => 'edit', :display_name => @user.display_name, :id => diary_entry.id %>

diff --git a/app/views/diary_entry/view.html.erb b/app/views/diary_entry/view.html.erb
index 7ff35b494bc9913be9dbfcb14acb64c9b9b971f4..8e71cb24298a5b9d9fdfc759e7e03308348629d0 100644 (file)
--- a/app/views/diary_entry/view.html.erb
+++ b/app/views/diary_entry/view.html.erb
@@ -4,7 +4,7 @@
 
 <a id="comments"></a>
 
-<%= render :partial => 'diary_comment', :collection => @entry.diary_comments %>
+<%= render :partial => 'diary_comment', :collection => @entry.visible_comments %>
 
 <% if @user %>