From 4465e93daefc2c9fb58d5a981645a1299c490f75 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 25 Jan 2016 10:16:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E8=BF=91=E7=99=BB=E5=BD=95=E6=8A=A550?=
 =?UTF-8?q?0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admin_controller.rb         | 4 ++--
 app/views/admin/latest_login_users.html.erb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 9e935ae40..68386de44 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -461,8 +461,8 @@ class AdminController < ApplicationController
     scope = User.order('last_login_on desc')
     scope = scope.where("last_login_on>= '#{params[:startdate]} 00:00:00'") if params[:startdate].present?
     scope =scope.where("last_login_on <= '#{params[:enddate]} 23:59:59'") if params[:enddate].present?
-    @user = scope
-    @user = paginateHelper @user,30
+    @users = scope
+    @users = paginateHelper @users,30
     @page = (params['page'] || 1).to_i - 1
     respond_to do |format|
       format.html
diff --git a/app/views/admin/latest_login_users.html.erb b/app/views/admin/latest_login_users.html.erb
index a32bdd33a..594f554b4 100644
--- a/app/views/admin/latest_login_users.html.erb
+++ b/app/views/admin/latest_login_users.html.erb
@@ -47,7 +47,7 @@
     </thead>
     <tbody>
         <% @count=@page * 30 %>
-        <% for user in @user do %>
+        <% for user in @users do %>
             <tr>
               <% @count +=1 %>
               <td align="center">