From 627bc9c8c76fa3d6f70ba97bc63ccda16b05448e Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 14 Sep 2016 09:14:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E8=AE=A8=E8=AE=BA=E5=8C=BA?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=BC=93=E5=AD=98=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_course_boardlist.html.erb | 72 +++++++++++-----------
 app/views/users/_course_newslist.html.erb  | 48 ++++++++-------
 2 files changed, 62 insertions(+), 58 deletions(-)

diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb
index 86b308778..d49d1ad3d 100644
--- a/app/views/users/_course_boardlist.html.erb
+++ b/app/views/users/_course_boardlist.html.erb
@@ -17,41 +17,43 @@
     <div class="bloglistbox">
       <% if topics.any? %>
           <% topics.each do |activity| %>
-              <div class="list-file">
-                <div><span class="item_list fl"></span>
-                  <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
-                      <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title fl" %>
-                  <% else %>
-                      <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title f1" %>
-                  <% end %>
-                  <% if activity.sticky == 1 %>
-                      <span class="fl ml10 red-cir-btn">顶</span>
-                  <% end%>
-                  <% if activity.locked %>
-                      <span class="fl ml10 green-cir-btn" title="已锁定">锁</span>
-                  <% end %>
-                  <% u = User.where("id=?",activity.author_id).first%>
-                  <div class="cl"></div>
-                </div>
-                <div class="massages-content ml15">
-                  <% if activity.parent_id.nil? %>
-                      <% content = activity.content %>
-                  <% else %>
-                      <% content = activity.parent.content %>
-                  <% end %>
-                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>75, :maxwidth=>563} %></p>
-                </div>
-                <div class="ml15 mt10">
-                  <span class="grayTxt">
-                      发帖人: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
-                  </span>
-                  <span class="grayTxt">更新：<%= format_time(activity.children.any? ? activity.children.last[:created_on] : activity[:created_on] ) %></span>
-                  <% all_comments = []%>
-                  <% count=get_all_children(all_comments, activity).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>
-                </div>
-                <div class="cl"></div>
-              </div>
+              <% cache [:course_boardslist_one,activity.id.to_s] do%>
+                  <div class="list-file">
+                    <div><span class="item_list fl"></span>
+                      <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+                          <%= link_to activity.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title fl" %>
+                      <% else %>
+                          <%= link_to activity.parent.subject.to_s.html_safe, board_message_path(activity.board_id, activity), :class=> "list-title f1" %>
+                      <% end %>
+                      <% if activity.sticky == 1 %>
+                          <span class="fl ml10 red-cir-btn">顶</span>
+                      <% end%>
+                      <% if activity.locked %>
+                          <span class="fl ml10 green-cir-btn" title="已锁定">锁</span>
+                      <% end %>
+                      <% u = User.where("id=?",activity.author_id).first%>
+                      <div class="cl"></div>
+                    </div>
+                    <div class="massages-content ml15">
+                      <% if activity.parent_id.nil? %>
+                          <% content = activity.content %>
+                      <% else %>
+                          <% content = activity.parent.content %>
+                      <% end %>
+                      <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>content, :maxheight=>54, :maxwordsnum=>75, :maxwidth=>563} %></p>
+                    </div>
+                    <div class="ml15 mt10">
+                      <span class="grayTxt">
+                          发帖人: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
+                      </span>
+                      <span class="grayTxt">更新：<%= format_time(activity.children.any? ? activity.children.last[:created_on] : activity[:created_on] ) %></span>
+                      <% all_comments = []%>
+                      <% count=get_all_children(all_comments, activity).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>
+                    </div>
+                    <div class="cl"></div>
+                  </div>
+              <% end %>
           <% end %>
           <div>
             <ul class="wlist" id="pages" >
diff --git a/app/views/users/_course_newslist.html.erb b/app/views/users/_course_newslist.html.erb
index 87dbe6b95..83cd1304f 100644
--- a/app/views/users/_course_newslist.html.erb
+++ b/app/views/users/_course_newslist.html.erb
@@ -17,29 +17,31 @@
     <div class="bloglistbox">
       <% if topics.any? %>
           <% topics.each do |activity| %>
-              <div class="list-file">
-                <div><span class="item_list fl"></span>
-                  <%= link_to activity.title.to_s, news_path(activity), :class => "list-title fl" %>
-                  <% if activity.sticky == 1 %>
-                      <span class="fl ml10 red-cir-btn">顶</span>
-                  <% end%>
-                  <% u = User.where("id=?",activity.author_id).first%>
-                  <div class="cl"></div>
-                </div>
-                <div class="massages-content ml15">
-                  <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>activity.description, :maxheight=>54, :maxwordsnum=>100, :maxwidth=>563} %></p>
-                </div>
-                <div class="ml15 mt10">
-                  <span class="grayTxt">
-                      发布者: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
-                  </span>
-                  <span class="grayTxt">更新：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.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>
-                </div>
-                <div class="cl"></div>
-              </div>
+              <% cache [:course_newslist_one,activity.id.to_s] do%>
+                  <div class="list-file">
+                    <div><span class="item_list fl"></span>
+                      <%= link_to activity.title.to_s, news_path(activity), :class => "list-title fl" %>
+                      <% if activity.sticky == 1 %>
+                          <span class="fl ml10 red-cir-btn">顶</span>
+                      <% end%>
+                      <% u = User.where("id=?",activity.author_id).first%>
+                      <div class="cl"></div>
+                    </div>
+                    <div class="massages-content ml15">
+                      <p><%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id =>activity.id, :content=>activity.description, :maxheight=>54, :maxwordsnum=>100, :maxwidth=>563} %></p>
+                    </div>
+                    <div class="ml15 mt10">
+                      <span class="grayTxt">
+                          发布者: <%=(u.try(:realname) != " " ? u.lastname + u.firstname : u.try(:login)) %>
+                      </span>
+                      <span class="grayTxt">更新：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.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>
+                    </div>
+                    <div class="cl"></div>
+                  </div>
+              <% end %>
           <% end %>
           <div>
             <ul class="wlist" id="pages" >