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 "打开#{@issue_open_count}".html_safe, "", :remote => true, :class => "new_roadmap_type_nomal", :id => "new_roadmap_type_1", :id => "new_roadmap_type_2" %>
  • - <%= link_to "锁定#{@issue_close_count}".html_safe, "", :remote => true, :class => "new_roadmap_type_nomal", :id => "new_roadmap_type_1", :id => "new_roadmap_type_3" %> + <%= link_to "关闭#{@issue_close_count}".html_safe, "", :remote => true, :class => "new_roadmap_type_nomal", :id => "new_roadmap_type_1", :id => "new_roadmap_type_3" %>
  • 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 @@

    成员 本页面展示关注了 <%= link_to @project.owner.try(:show_name), user_path(@project.owner) %>/<%= link_to @project.name, project_path(@project) %> 的用户

    + +
    +
    + +
    +
    +
    +
    +