From e6e4a320ee1191fb8ee7bf3b56a0813f7410f1f9 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 25 Nov 2016 10:47:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=85=B3=E6=B3=A8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb  | 10 ++++++++++
 app/views/issues/_statistics.html.erb   |  2 +-
 app/views/projects/watcherlist.html.erb | 13 ++++++++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 304ab8e02..4e9829d62 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -971,6 +971,14 @@ class ProjectsController < ApplicationController
       else
         @users -= watched.watcher_users if  @watched
       end
+      @watchers = @project.watcher_users
+      @limit = 20
+      @is_remote = true
+      @watchers_count = @watchers.count
+      @watcher_pages = Paginator.new @watchers_count, @limit, params['page'] || 1
+      @offset ||= @watcher_pages.offset
+      #@curse_attachments_all = @all_attachments[@offset, @limit]
+      @watchers = paginateHelper @watchers,20
     end
   end
 
@@ -987,5 +995,7 @@ class ProjectsController < ApplicationController
     end
     return projects
   end
+
   #gcmend
 end
+
diff --git a/app/views/issues/_statistics.html.erb b/app/views/issues/_statistics.html.erb
index b144b8e6b..8b1fc6f22 100644
--- a/app/views/issues/_statistics.html.erb
+++ b/app/views/issues/_statistics.html.erb
@@ -12,7 +12,7 @@
         <%= link_to "打开<span class='new_roadmap_nav_tagnomal ml5' id='new_roadmap_num_2'>#{@issue_open_count}</span>".html_safe, "", :remote => true, :class => "new_roadmap_type_nomal", :id => "new_roadmap_type_1", :id => "new_roadmap_type_2" %>
       </li>
       <li id="new_roadmap_nav_3" onclick="HoverLi(3);">
-        <%= link_to "锁定<span class='new_roadmap_nav_tagnomal ml5' id='new_roadmap_num_3'>#{@issue_close_count}</span>".html_safe, "", :remote => true, :class => "new_roadmap_type_nomal", :id => "new_roadmap_type_1", :id => "new_roadmap_type_3" %>
+        <%= link_to "关闭<span class='new_roadmap_nav_tagnomal ml5' id='new_roadmap_num_3'>#{@issue_close_count}</span>".html_safe, "", :remote => true, :class => "new_roadmap_type_nomal", :id => "new_roadmap_type_1", :id => "new_roadmap_type_3" %>
       </li>
     </ul>
   </div><!--issues_statistics end-->
diff --git a/app/views/projects/watcherlist.html.erb b/app/views/projects/watcherlist.html.erb
index 65239b53a..ffa0670de 100644
--- a/app/views/projects/watcherlist.html.erb
+++ b/app/views/projects/watcherlist.html.erb
@@ -1,7 +1,7 @@
 <div class="pro_new_info mb10">
   <h2 class="clear">成员<span class="fr pro_new_font mr15" > 本页面展示关注了 <%= link_to @project.owner.try(:show_name), user_path(@project.owner) %>/<%= link_to @project.name, project_path(@project) %> 的用户</span></h2>
   <ul class="clear pro_new_users_box">
-    <% @project.watcher_users.each do |user| %>
+    <% @watchers.each do |user| %>
         <li class="clear">
           <%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_path(user), :alt => "用户头像", :class => "pro_new_users fl mr5" %>
           <div class="fl mt5 clear">
@@ -15,3 +15,14 @@
     <% end %>
   </ul>
 </div>
+
+<div style="text-align:center;">
+  <div class="pages" style="width:auto; display:inline-block;">
+    <ul  id="homework_pository_ref_pages">
+      <%= pagination_links_full @watcher_pages, @watchers_count, :per_page_links => false, :remote => false, :flag => true, :is_new => true %>
+    </ul>
+    <div class="cl"></div>
+  </div>
+</div>
+<div class="cl"></div>
+