Merge branch 'release/0.5.8_patch.4'

* release/0.5.8_patch.4: #FIX comments
ulmic · Jan 22, 2016 · e911cca · e911cca
2 parents d380974 + cba216b
commit e911cca
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/app/controllers/web/news_controller.rb b/app/controllers/web/news_controller.rb
@@ -25,7 +25,7 @@ def show
     @next_news = News.published.next @news.id
     @same_events = ::EventDecorator.decorate_collection same_events
     @popular_news = NewsDecorator.decorate_collection News.popular.first 6
-    @comments = @news.comments.published
+    @comments = @news.comments.published.decorate
     @banner = Banner.active.with_vertical.actual.last
   end
 

diff --git a/app/decorators/comment_decorator.rb b/app/decorators/comment_decorator.rb
@@ -1,7 +1,5 @@
 class CommentDecorator < ApplicationDecorator
   delegate_all
 
-  def short_name
-    object.user.decorate.short_name
-  end
+  decorates_association :user
 end
diff --git a/app/views/web/comments/_index.html.haml b/app/views/web/comments/_index.html.haml
@@ -1,3 +1,5 @@
+= stylesheet_link_tag 'web/comments'
+= javascript_include_tag 'web/comments'
 - comments.each do |comment|
   .row.comment
     .small-2.columns
@@ -7,7 +9,7 @@
         = image_tag comment.user.default_avatar(:image_url)
     .columns.text{ class: (signed_in? && (current_user.id == comment.user.id || current_user.role.admin?)) ? 'small-9' : 'small-10' }
       %h4
-        = comment.short_name
+        = comment.user.short_name
       = comment.text
     - if signed_in? && (current_user.id == comment.user.id || current_user.role.admin?)
       .small-1.columns