From 09506c0954b75ebfe8eb1fabc350d501013530cf Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 25 Nov 2016 12:17:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98,=E5=85=B3?=
 =?UTF-8?q?=E6=B3=A8=E6=88=90=E5=91=98=EF=BC=8Cfork=E6=96=B0=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb        | 23 +++++++++++--------
 app/views/projects/member_forked.html.erb     | 10 ++++++++
 .../settings/_new_repositories.html.erb       |  8 ++++---
 app/views/projects/watcherlist.html.erb       | 19 +++++++--------
 4 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 13a1a1e58..09cede45a 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -601,6 +601,13 @@ class ProjectsController < ApplicationController
   def member_forked
     @forked_projects = Project.where(:forked_from_project_id => @project.id)
 
+    @limit = 20
+    @is_remote = true
+    @forked_count = @project.forked_count
+    @forked_pages = Paginator.new @forked_count, @limit, params['page'] || 1
+    @offset ||= @forked_pages.offset
+    @forked_projects = paginateHelper @forked_projects, @limit
+
     # @forked_members = User.find_by_sql("SELECT u.* FROM `projects` p,`users` u where p.user_id = u.id and p.forked_from_project_id = #{@project.id} ;")
   end
 
@@ -664,7 +671,13 @@ class ProjectsController < ApplicationController
   end
 
   def statistics
-
+    @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
+    @watchers = paginateHelper @watchers, 20
   end
   #end
 
@@ -972,14 +985,6 @@ 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
 
diff --git a/app/views/projects/member_forked.html.erb b/app/views/projects/member_forked.html.erb
index 5ea62b4c9..668feef98 100644
--- a/app/views/projects/member_forked.html.erb
+++ b/app/views/projects/member_forked.html.erb
@@ -14,4 +14,14 @@
         </li>
     <% end %>
   </ul>
+  <div style="text-align:center;">
+    <div class="pages" style="width:auto; display:inline-block;">
+      <ul  id="homework_pository_ref_pages">
+        <%= pagination_links_full @forked_pages, @forked_count, :per_page_links => false, :remote => false, :flag => true, :is_new => true %>
+      </ul>
+      <div class="cl"></div>
+    </div>
+  </div>
+  <div class="cl"></div>
 </div>
+
diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb
index 7322a0615..edffbdd19 100644
--- a/app/views/projects/settings/_new_repositories.html.erb
+++ b/app/views/projects/settings/_new_repositories.html.erb
@@ -18,10 +18,12 @@
               <span style="display: none" class="c_orange ml100" id="valid_repository_name">版本库名是无效的</span>
             </li>
             <li class="clear">
-            <!--  <label class=" fl">&nbsp;&nbsp;</label>-->
-              <p class=" fl c_grey pro_new_grey">1.长度必须在1到254个字符之间<br/>
+              <label class=" fl">&nbsp;&nbsp;</label>
+              <p class=" fl c_grey pro_new_grey">
+                1.长度必须在1到254个字符之间<br/>
                 2.仅限使用小写字母（a-z）、数字、破折号（-）和下划线（_）<br>
-                3.一旦保存，标识无法修改</p>
+                3.一旦保存，标识无法修改
+              </p>
             </li>
           </ul>
           <a href="javascript:void(0)" onclick="cancel_for_create();" class="fr sy_btn_grey"><%=l(:button_cancel)%></a>
diff --git a/app/views/projects/watcherlist.html.erb b/app/views/projects/watcherlist.html.erb
index ffa0670de..65834d0f9 100644
--- a/app/views/projects/watcherlist.html.erb
+++ b/app/views/projects/watcherlist.html.erb
@@ -14,15 +14,16 @@
         </li>
     <% 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 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>
 </div>
-<div class="cl"></div>
+
+