From c16f99774b8102a90da4166590315bdf6a2fa727 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Wed, 30 Dec 2015 16:57:40 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=BB=84=E7=BB=87=E5=8F=B6=E5=BA=95=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/_org_activities.html.erb | 15 ++-------------
 app/views/organizations/show.html.erb            |  8 ++++----
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb
index 8bffb7c47..b82bbb642 100644
--- a/app/views/organizations/_org_activities.html.erb
+++ b/app/views/organizations/_org_activities.html.erb
@@ -50,7 +50,7 @@
             <% end %>
         <% end %>
         <% if act.container_type == 'OrgSubfield' %>
-            <% if act.org_act_type == 'Message' and act.org_act_id  and Message.where("id=#{act.org_act_id}").count > 0 %>
+            <% if act.org_act_type == 'Message' and act.org_act_id %>
                 <% message = Message.find(act.org_act_id) %>
                 <% if !message.board.course_id.nil? %>
                     <%= render :partial => 'org_course_message', :locals => {:activity => message,:user_activity_id =>act.id} %>
@@ -62,21 +62,10 @@
             <% end %>
         <% end %>
     <% end %>
-    <!--<ul class="wlist" style=" border:none; padding-top: 15px;">-->
-    <%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
-    <!--</ul>-->
+
 <% end %>
 
 <% if org_act_count == 10 %>
-    <!--<div id="show_more_activities" class="loadMore mt10 f_grey">点击展开更多<%#=link_to "", organization_path(org,:page => page.to_i + 1, :show_homepage =>params[:show_homepage],:type => params[:type]),:id => "more_org_activities_link",:remote => "true",:class => "none" %></div>-->
     <%= link_to "点击展开更多",organization_path(org,:page => page.to_i + 1, :show_homepage =>params[:show_homepage],:type => params[:type]),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
 <% end%>
 
-<!--
-<script>
-    $(function(){
-        $("#show_more_activities").mouseover(function(){
-            $("#more_org_activities_link").click();
-        })
-    })
-
diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb
index 37f4d00ed..a79271add 100644
--- a/app/views/organizations/show.html.erb
+++ b/app/views/organizations/show.html.erb
@@ -69,10 +69,10 @@
 <% end  %>
 <% if @org_activities %>
     <%= render :partial =>  'organizations/org_activities',
-           :locals => {:org_activities =>@org_activities,
-                       :page=>@page,
-                       :org => @organization,
-                       :org_act_count=>@org_activities.count}%>
+               :locals => {:org_activities => @org_activities,
+                           :page=> @page,
+                           :org => @organization,
+                           :org_act_count=> @org_activities.count} %>
 <% end %>