From c500fc13db66e52a5aa3dfb8c59cc6e3c19b63b5 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 8 Jan 2016 15:21:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=84=E7=BB=87=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E4=B8=AD=EF=BC=8C=E7=AC=AC=E4=BA=8C=E9=A1=B5=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E6=98=BE=E7=A4=BA=E7=AC=AC=E4=B8=80=E9=A1=B5=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb      | 2 +-
 app/views/organizations/_org_activities.html.erb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index d428a5814..18eb25675 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -100,7 +100,7 @@ class OrganizationsController < ApplicationController
             @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'Poll' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
         end
       end
-      @page = params[:page]
+      @page = params[:page] ? params[:page].to_i : 1
       respond_to do |format|
         format.html
         format.js
diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb
index ef4329c0d..29bfb4e18 100644
--- a/app/views/organizations/_org_activities.html.erb
+++ b/app/views/organizations/_org_activities.html.erb
@@ -47,7 +47,7 @@
                   <div class="homepagePostBrief">
                     <div class="homepagePostPortrait">
                       <a href="javascript:void(0);"><%= image_tag(url_to_avatar(User.find(act.user_id)),  :width => "45", :height => "45") %></a>
-                      <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
+                      <%= render :partial => 'users/show_detail_info', :locals => {:user => User.find(act.user_id)} %>
                     </div>
                     <div class="homepagePostDes">
                       <div class="homepagePostTo"><%= link_to User.find(act.user_id), user_path(act.user_id) %>&nbsp;&nbsp;创建了 <a href="<%= organization_path(@organization)%>" class="newsBlue ml10"><%= Organization.find(act.org_act_id).name %>
@@ -103,6 +103,6 @@
 <% end %>
 
 <% if org_act_count == 10 %>
-    <%= 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"%>
+    <%= 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%>