From d67d21eb428d27c9bbd9ea4ac2fa5d9a6bbb78a4 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Wed, 12 Aug 2015 11:28:51 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=A7=A3=E5=86=B3=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A0=20=E5=88=86=E9=A1=B5=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb | 6 ++++++
 app/views/projects/search.html.erb     | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 3dfae3432..f042bba50 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -86,8 +86,14 @@ class ProjectsController < ApplicationController
       @project_pages = Project.project_entities.visible.like(params[:name]).page(params[:page]).per(10)
     else
       @project_pages =  Project.project_entities.visible.page(params[:page] ).per(10)
+      @project_pages =  Project.project_entities.visible.page(params[:page] ).per(10)
     end
     @projects =   @project_pages.order("created_on desc")
+    @limit = 10#per_page_option
+
+    @project_count = Project.project_entities.visible.like(params[:name]).page(params[:page]).count
+    @project_pages = Paginator.new @project_count, @limit, params['page']
+
     respond_to do |format|
       format.html {
         render :layout => 'base'
diff --git a/app/views/projects/search.html.erb b/app/views/projects/search.html.erb
index b77b3fda6..3f2a61306 100644
--- a/app/views/projects/search.html.erb
+++ b/app/views/projects/search.html.erb
@@ -104,9 +104,13 @@
 </div>
 <% end %>
 
+<div class="pagination">
+  <ul>
+    <%= pagination_links_full @project_pages, @user_count %>
+  </ul>
+</div>
 
-
-<%= paginate  @project_pages %>
+<%#= paginate  @project_pages %>