From e34f2e45db277b5d96ce83581ce1ba4d60323633 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 18 Mar 2016 14:53:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8=E5=92=8C=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=88=97=E8=A1=A8=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admin_controller.rb | 4 ++++ app/views/admin/courses.html.erb | 4 ++++ app/views/admin/projects.html.erb | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 90981b52a..f8ca1d0e2 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -40,12 +40,16 @@ class AdminController < ApplicationController @projects = scope.where(project_type: Project::ProjectType_project).reorder("created_on desc").all =end @projects = Project.like(@name).order('created_on desc') + @projects = paginateHelper @projects,30 + @page = (params['page'] || 1).to_i - 1 render :action => "projects", :layout => false if request.xhr? end def courses @name = params[:name] @courses = Course.like(@name).order('created_at desc') + @courses = paginateHelper @courses,30 + @page = (params['page'] || 1).to_i - 1 respond_to do |format| format.html end diff --git a/app/views/admin/courses.html.erb b/app/views/admin/courses.html.erb index 1615bccbc..2505b3d06 100644 --- a/app/views/admin/courses.html.erb +++ b/app/views/admin/courses.html.erb @@ -73,4 +73,8 @@ + + <% html_title(l(:label_course_all)) -%> diff --git a/app/views/admin/projects.html.erb b/app/views/admin/projects.html.erb index d12e85856..5e3a927da 100644 --- a/app/views/admin/projects.html.erb +++ b/app/views/admin/projects.html.erb @@ -73,6 +73,10 @@ + + <% html_title(l(:label_project_plural)) -%>