项目成员,关注成员,fork新页面
This commit is contained in:
parent
c1ee387a66
commit
09506c0954
|
@ -601,6 +601,13 @@ class ProjectsController < ApplicationController
|
||||||
def member_forked
|
def member_forked
|
||||||
@forked_projects = Project.where(:forked_from_project_id => @project.id)
|
@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} ;")
|
# @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
|
end
|
||||||
|
|
||||||
|
@ -664,7 +671,13 @@ class ProjectsController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def statistics
|
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
|
||||||
#end
|
#end
|
||||||
|
|
||||||
|
@ -972,14 +985,6 @@ class ProjectsController < ApplicationController
|
||||||
else
|
else
|
||||||
@users -= watched.watcher_users if @watched
|
@users -= watched.watcher_users if @watched
|
||||||
end
|
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
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -14,4 +14,14 @@
|
||||||
</li>
|
</li>
|
||||||
<% end %>
|
<% end %>
|
||||||
</ul>
|
</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>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -18,10 +18,12 @@
|
||||||
<span style="display: none" class="c_orange ml100" id="valid_repository_name">版本库名是无效的</span>
|
<span style="display: none" class="c_orange ml100" id="valid_repository_name">版本库名是无效的</span>
|
||||||
</li>
|
</li>
|
||||||
<li class="clear">
|
<li class="clear">
|
||||||
<!-- <label class=" fl"> </label>-->
|
<label class=" fl"> </label>
|
||||||
<p class=" fl c_grey pro_new_grey">1.长度必须在1到254个字符之间<br/>
|
<p class=" fl c_grey pro_new_grey">
|
||||||
|
1.长度必须在1到254个字符之间<br/>
|
||||||
2.仅限使用小写字母(a-z)、数字、破折号(-)和下划线(_)<br>
|
2.仅限使用小写字母(a-z)、数字、破折号(-)和下划线(_)<br>
|
||||||
3.一旦保存,标识无法修改</p>
|
3.一旦保存,标识无法修改
|
||||||
|
</p>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<a href="javascript:void(0)" onclick="cancel_for_create();" class="fr sy_btn_grey"><%=l(:button_cancel)%></a>
|
<a href="javascript:void(0)" onclick="cancel_for_create();" class="fr sy_btn_grey"><%=l(:button_cancel)%></a>
|
||||||
|
|
|
@ -14,15 +14,16 @@
|
||||||
</li>
|
</li>
|
||||||
<% end %>
|
<% end %>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
<div style="text-align:center;">
|
||||||
|
<div class="pages" style="width:auto; display:inline-block;">
|
||||||
<div style="text-align:center;">
|
<ul id="homework_pository_ref_pages">
|
||||||
<div class="pages" style="width:auto; display:inline-block;">
|
<%= pagination_links_full @watcher_pages, @watchers_count, :per_page_links => false, :remote => false, :flag => true, :is_new => true %>
|
||||||
<ul id="homework_pository_ref_pages">
|
</ul>
|
||||||
<%= pagination_links_full @watcher_pages, @watchers_count, :per_page_links => false, :remote => false, :flag => true, :is_new => true %>
|
<div class="cl"></div>
|
||||||
</ul>
|
</div>
|
||||||
<div class="cl"></div>
|
|
||||||
</div>
|
</div>
|
||||||
|
<div class="cl"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="cl"></div>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue