From 707244886c00f0adbb06d6a2134e9b2a6dbb2d01 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 16 Oct 2015 14:48:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E6=A0=A1=E5=88=97=E8=A1=A8=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admin_controller.rb   | 11 ++++++++---
 app/views/admin/schools.html.erb      |  3 +++
 app/views/layouts/base_admin.html.erb |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 5666934b6..477a8e2b9 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -346,11 +346,16 @@ class AdminController < ApplicationController
   #学校列表
   def schools
     @school_name = params[:school_name]
-    if @school_name
+    if @school_name && @school_name != ''
       @schools = School.where("name like '%#{@school_name}%'")
-    else
-      @schools = School.all
+    elsif @school_name.nil?
+      @schools = []
+    else  @school_name && @school_name == ' '
+    @schools = School.where('1=1')
     end
+    @school_count = @schools.count
+    @school_pages = Paginator.new @school_count, per_page_option, params['page'] || 1
+    @schools = paginateHelper @schools,100
     respond_to do |format|
       format.html
     end
diff --git a/app/views/admin/schools.html.erb b/app/views/admin/schools.html.erb
index 0956981e8..d19e9b3b9 100644
--- a/app/views/admin/schools.html.erb
+++ b/app/views/admin/schools.html.erb
@@ -46,5 +46,8 @@
     </tbody>
   </table>
 </div>
+<ul class="wlist" id="pages" style="float: right;margin-top: 10px;">
+  <%= pagination_links_full @school_pages, @school_count ,:per_page_links => true, :remote => false, :flag => true %>
+</ul>
 
 <% html_title(l(:label_project_plural)) -%>
diff --git a/app/views/layouts/base_admin.html.erb b/app/views/layouts/base_admin.html.erb
index 1cdbbd6df..cff80a15d 100644
--- a/app/views/layouts/base_admin.html.erb
+++ b/app/views/layouts/base_admin.html.erb
@@ -12,7 +12,7 @@
 		<meta name="keywords" content="issue,bug,tracker" />
 		<%= csrf_meta_tag %>
 		<%= favicon %>
-		<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %>
+		<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application','project', :media => 'all' %>
 		<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 		<%= javascript_heads %>
 		<%= heads_for_theme %>