From 67d179816300d9192fa497d89509e84173e66e04 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 31 Mar 2016 18:11:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9news500=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_org_new_course_act_list.html.erb | 8 ++++----
 .../organizations/_org_new_project_act_list.html.erb      | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/organizations/_org_new_course_act_list.html.erb b/app/views/organizations/_org_new_course_act_list.html.erb
index 18a1e6662..56202ee86 100644
--- a/app/views/organizations/_org_new_course_act_list.html.erb
+++ b/app/views/organizations/_org_new_course_act_list.html.erb
@@ -34,13 +34,13 @@
     <% elsif act.org_act_type == "News" %>
         <% activity = News.find(act.org_act_id) %>
         <div class="row-ziyuan fl">
-          <%= link_to image_tag(url_to_avatar(activity.creator),:width => "40", :height => "40"), user_path(activity.creator), :class => "fl user-img" %>
+          <%= link_to image_tag(url_to_avatar(activity.author),:width => "40", :height => "40"), user_path(activity.author), :class => "fl user-img" %>
           <!--<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>-->
           <div class="ziyuan-box fl">
             <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
-            <p class="fl"><span >发布时间：<%= format_date activity.updated_at %></span>
-              <span> 作者：<%= activity.try(:creator).try(:realname).nil? ? activity.try(:creator).try(:login) : activity.try(:creator).try(:realname) %></span>
-              <span class="fr right-info2"> <%= activity.children.count %></span> </p>
+            <p class="fl"><span >发布时间：<%= format_date activity.created_on %></span>
+              <span> 作者：<%= activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname) %></span>
+              <span class="fr right-info2"> <%= activity.comments.count %></span> </p>
           </div>
         </div><!--row-ziyuan end-->
     <% end %>
diff --git a/app/views/organizations/_org_new_project_act_list.html.erb b/app/views/organizations/_org_new_project_act_list.html.erb
index b3754024f..407c8fa97 100644
--- a/app/views/organizations/_org_new_project_act_list.html.erb
+++ b/app/views/organizations/_org_new_project_act_list.html.erb
@@ -35,13 +35,13 @@
     <% elsif act.org_act_type == "News" %>
         <% activity = News.find(act.org_act_id) %>
         <div class="row-ziyuan fl">
-          <%= link_to image_tag(url_to_avatar(activity.creator),:width => "40", :height => "40"), user_path(activity.creator), :class => "fl user-img" %>
+          <%= link_to image_tag(url_to_avatar(activity.author),:width => "40", :height => "40"), user_path(activity.author), :class => "fl user-img" %>
           <!--<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>-->
           <div class="ziyuan-box fl">
             <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "fl ziyuan-title" %>
-            <p class="fl"><span >发布时间：<%= format_date activity.updated_at %></span>
-              <span> 作者：<%= activity.try(:creator).try(:realname).nil? ? activity.try(:creator).try(:login) : activity.try(:creator).try(:realname) %></span>
-              <span class="fr right-info2"> <%= activity.children.count %></span> </p>
+            <p class="fl"><span >发布时间：<%= format_date activity.created_on %></span>
+              <span> 作者：<%= activity.try(:author).try(:realname).nil? ? activity.try(:author).try(:login) : activity.try(:author).try(:realname) %></span>
+              <span class="fr right-info2"> <%= activity.comments.count %></span> </p>
           </div>
         </div><!--row-ziyuan end-->
     <% end %>