jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改项目配置--版本库--用户列表 404问题

This commit is contained in:
huang 2015-06-19 13:59:02 +08:00
parent 5b98dd83b2
commit 0a7a834ebe
3 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/repositories_controller.rb
View File

@ -227,7 +227,7 @@ update
elsif request.get? elsif request.get?
respond_to do |format| respond_to do |format|
format.html{ format.html{
render :layout => "project_base" render :layout => "base_projects"
} }
end end

3
app/views/projects/settings/_new_repositories.html.erb
View File

@ -33,8 +33,7 @@
<td><a href="javascript:viod(0)" class="c_blue" > <td><a href="javascript:viod(0)" class="c_blue" >
<% if repository.scm_name=="Git"%> <% if repository.scm_name=="Git"%>
<%if User.current.allowed_to?(:manage_repository, @project) %> <%if User.current.allowed_to?(:manage_repository, @project) %>
<%= link_to(l(:label_user_plural), committers_repository_path(repository) <%= link_to(l(:label_user_plural), committers_repository_path(repository)) %>
) %>
<% end %> <% end %>
<% end %> <% end %>
</a></td> </a></td>

26
app/views/projects/settings/_repositories.html.erb
View File

@ -27,25 +27,15 @@
<% end %> <% end %>
<td class="buttons" style="text-align:left"> <td class="buttons" style="text-align:left">
<% if repository.scm_name=="Subversion"%>
<%if User.current.allowed_to?(:manage_repository, @project) %> <%if User.current.allowed_to?(:manage_repository, @project) %>
<%= link_to(l(:label_user_plural), committers_repository_path(repository), <!-- <%#= link_to(l(:button_edit), edit_repository_path(repository),
:class => 'icon icon-user') %>
<%= link_to(l(:button_edit), edit_repository_path(repository),
:class => 'icon icon-edit') %>
<%= delete_link repository_path(repository) %>
<% end %>
<% elsif repository.scm_name=="Git"%>
<%if User.current.allowed_to?(:manage_repository, @project) %>
<!-- <%#= link_to(l(:button_edit), edit_repository_path(repository),
:class => 'icon icon-edit') %> --> :class => 'icon icon-edit') %> -->
<%= link_to(l(:label_user_plural), committers_repository_path(repository), <%= link_to(l(:label_user_plural), committers_repository_path(repository), :class => 'icon icon-user') %>
:class => 'icon icon-user') %> <% if repository.login.to_s==User.current.login.to_s %>
<% if repository.login.to_s==User.current.login.to_s %> <%= delete_link repository_path(repository) %>
<%= delete_link repository_path(repository) %> <% end %>
<% end %> <% end %>
<% end %>
<% end %>
</td> </td>
</tr> </tr>
<% end %> <% end %>