nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

eager load author and profile for comments

Browse source
This commit is contained in:
danielgrippi 2011-11-04 16:40:04 -07:00
parent f3183a11e1
commit 3296477531
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/comment.rb
View file

@ -32,6 +32,8 @@ class Comment < ActiveRecord::Base
serialize :youtube_titles, Hash serialize :youtube_titles, Hash
scope :including_author, includes(:author => :profile)
before_save do before_save do
self.text.strip! unless self.text.nil? self.text.strip! unless self.text.nil?
end end

4
app/views/comments/_comments.html.haml
View file

@ -9,9 +9,9 @@
%ul.comments{:class => ('loaded' if post.comments.size <= 3)} %ul.comments{:class => ('loaded' if post.comments.size <= 3)}
-if post.comments.size > 3 && !comments_expanded && ! all_comments? -if post.comments.size > 3 && !comments_expanded && ! all_comments?
= render :partial => 'comments/comment', :collection => post.comments.last(3), :locals => {:post => post} = render :partial => 'comments/comment', :collection => post.comments.last(3).including_author, :locals => {:post => post}
-else -else
= render :partial => 'comments/comment', :collection => post.comments, :locals => {:post => post} = render :partial => 'comments/comment', :collection => post.comments.including_author, :locals => {:post => post}
- unless commenting_disabled?(post) - unless commenting_disabled?(post)
.new_comment_form_wrapper{:class => comment_form_wrapper_class(post)} .new_comment_form_wrapper{:class => comment_form_wrapper_class(post)}