deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix edit project members access link and page fixes refs #2745

Browse source
This commit is contained in:
Andrey Kumanyaev 2013-01-25 21:20:15 +04:00
parent 5ee8c132a5
commit 6efda51cc5
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/projects/application_controller.rb
View file

@ -6,6 +6,6 @@ class Admin::Projects::ApplicationController < Admin::ApplicationController
protected
def project
@project ||= Project.find_by_path(params[:project_id])
@project ||= Project.find_with_namespace(params[:project_id])
end
end

2
app/controllers/admin/projects/members_controller.rb
View file

@ -22,7 +22,7 @@ class Admin::Projects::MembersController < Admin::Projects::ApplicationControlle
private
def team_member
@member ||= project.users.find(params[:id])
@member ||= project.users.find_by_username(params[:id])
end
def team_member_relation

4
app/views/admin/users/show.html.haml
View file

@ -123,5 +123,5 @@
%tr
%td= link_to project.name_with_namespace, admin_project_path(project)
%td= tm.project_access_human
%td= link_to 'Edit Access', edit_admin_team_member_path(tm), class: "btn small"
%td= link_to 'Remove from team', admin_team_member_path(tm), confirm: 'Are you sure?', method: :delete, class: "btn small danger"
%td= link_to 'Edit Access', edit_admin_project_member_path(project.path_with_namespace, tm.user.username), class: "btn small"
%td= link_to 'Remove from team', admin_project_member_path(project.path_with_namespace, tm.user.username), confirm: 'Are you sure?', method: :delete, class: "btn small danger"

2
config/routes.rb
View file

@ -84,7 +84,7 @@ Gitlab::Application.routes.draw do
get :team
put :team_update
end
scope module: :projects, constraints: { id: /[^\/]+/ } do
scope module: :projects, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ } do
resources :members, only: [:edit, :update, :destroy]
end
end