From 235554a104a6f327fbfb84369bb849145b90ed0f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 13 Sep 2016 16:34:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=97=BB=E9=A6=96=E9=A1=B5=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_course_newslist.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/users/_course_newslist.html.erb b/app/views/users/_course_newslist.html.erb
index 87dbe6b95..961b2bfdf 100644
--- a/app/views/users/_course_newslist.html.erb
+++ b/app/views/users/_course_newslist.html.erb
@@ -23,7 +23,7 @@
                   <% if activity.sticky == 1 %>
                       <span class="fl ml10 red-cir-btn">顶</span>
                   <% end%>
-                  <% u = User.where("id=?",activity.author_id).first%>
+                  <%# u = User.where("id=?",activity.author_id).first%>
                   <div class="cl"></div>
                 </div>
                 <div class="massages-content ml15">
@@ -31,9 +31,9 @@
                 </div>
                 <div class="ml15 mt10">
                   <span class="grayTxt">
-                      发布者: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
+                      发布者: <%= activity.author.show_name %>
                   </span>
-                  <span class="grayTxt">更新：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %></span>
+                  <span class="grayTxt">更新：<%= format_time(activity.course_acts.first.try(:updated_at)) %></span>
                   <% count=0 %>
                   <% count=activity.comments.count %>
                   <p class="list-info fr grayTxt"><span><%= count>0 ? "#{count}" : "0" %></span><span>回复</span><span>|</span><span><%= get_praise_num(activity) > 0 ? "#{get_praise_num(activity)}" : "0" %></span><span>赞</span></p>