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 @@ + <% 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 @@ <%= 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 %>