From 6cca44df98b1c6924def2530093cb3f1c75b90cf Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 16 May 2016 14:53:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=A1=B9=E7=9B=AE=E3=80=81?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_org_subfield_leftM1.html.erb             | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/views/organizations/_org_subfield_leftM1.html.erb b/app/views/organizations/_org_subfield_leftM1.html.erb
index a2822f5ba..ed3bcba7e 100644
--- a/app/views/organizations/_org_subfield_leftM1.html.erb
+++ b/app/views/organizations/_org_subfield_leftM1.html.erb
@@ -1,4 +1,3 @@
-
 <% if is_default_field?(field) %>
     <% case field.name %>
     <% when 'course' %>
@@ -44,7 +43,7 @@
                       <div class="sn-news-txt">
                         <div class="sn-news-wrap"><%= activity.content.to_s.html_safe %></div>
                       </div>
-                      <div class="sn-read-more"><%=link_to "查看全文>>", activity.parent_id.nil? ? activity.subject.to_s.html_safe : activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                      <div class="sn-read-more"><%=link_to "查看全文>>", board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
                     </div>
                 <% elsif act.org_act_type == "News" %>
                     <% activity = News.find(act.org_act_id) %>
@@ -63,7 +62,7 @@
                         <div class="sn-news-wrap"><%= activity.description.to_s.html_safe %></div>
                       </div>
 
-                      <div class="sn-read-more"><%=link_to "查看全文>>", activity.title.to_s, news_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                      <div class="sn-read-more"><%=link_to "查看全文>>", news_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
                     </div>
                 <% elsif act.org_act_type == "Poll" %>
                     <% activity = Poll.find(act.org_act_id) %>
@@ -88,7 +87,7 @@
                           <div class="sn-news-txt">
                             <div class="sn-news-wrap"><%= activity.polls_description.to_s.html_safe %></div>
                           </div>
-                          <div class="sn-read-more"><%=link_to "查看全文>>", poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                          <div class="sn-read-more"><%=link_to "查看全文>>", Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
                         </div>
                     <% end %>
                 <% end %>
@@ -119,7 +118,7 @@
                       <div class="sn-news-txt">
                         <div class="sn-news-wrap"><%= activity.description.to_s.html_safe %></div>
                       </div>
-                      <div class="sn-read-more"><%=link_to "查看全文>>", activity.subject.to_s, issue_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                      <div class="sn-read-more"><%=link_to "查看全文>>", issue_url_in_org(activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
                     </div>
                 <% elsif act.org_act_type == "Message" %>
                     <% activity = Message.find(act.org_act_id) %>
@@ -137,7 +136,7 @@
                       <div class="sn-news-txt">
                         <div class="sn-news-wrap"><%= activity.content.to_s.html_safe %></div>
                       </div>
-                      <div class="sn-read-more"><%=link_to "查看全文>>", activity.parent_id.nil? ? activity.subject.to_s.html_safe : activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                      <div class="sn-read-more"><%=link_to "查看全文>>",  board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
                     </div>
                 <% elsif act.org_act_type == "News" %>
                     <% activity = News.find(act.org_act_id) %>
@@ -217,7 +216,7 @@
                               <div class="sn-news-txt">
                                 <div class="sn-news-wrap"><%= content.to_s.html_safe %></div>
                               </div>
-                              <div class="sn-read-more"><%=link_to "查看全文>>", message.parent_id.nil? ? message.subject.to_s.html_safe : message.parent.subject.to_s.html_safe, board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                              <div class="sn-read-more"><%=link_to "查看全文>>", board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
                             </div>
                         <% else %>
                             <div class="sn-news-bigbox fl">
@@ -239,9 +238,9 @@
                               </div>
                               <div class="sn-read-more">
                                 <% if message.parent_id.nil? %>
-                                    <%=link_to "查看全文>>", message.subject.to_s.html_safe, board_message_path(message.board,message), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>
+                                    <%=link_to "查看全文>>", board_message_path(message.board,message), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>
                                 <% else %>
-                                    <%=link_to "查看全文>>", message.parent.subject.to_s.html_safe, board_message_path(message.board,activity), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>
+                                    <%=link_to "查看全文>>", board_message_path(message.board,activity), :target => "_blank", :class => "sn-link-grey2 sn-fr" %>
                                 <% end %>
                               </div>
                             </div>
@@ -263,7 +262,7 @@
                           <div class="sn-news-txt">
                             <div class="sn-news-wrap"><%= news.description.to_s.html_safe %></div>
                           </div>
-                          <div class="sn-read-more"><%=link_to "查看全文>>", news.title.to_s, news_path(news), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
+                          <div class="sn-read-more"><%=link_to "查看全文>>", news_path(news), :target => "_blank", :class => "sn-link-grey2 sn-fr" %></div>
                         </div>
                     <% end %>
                 <% end %>