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

Manage team from groups page. Phase 1

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-11-29 20:14:05 +03:00
parent 08fded3fac
commit aaa1c94239
5 changed files with 66 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/controllers/groups_controller.rb
View file

@ -47,7 +47,12 @@ class GroupsController < ApplicationController
end
def people
@users = group.users
@project = group.projects.find(params[:project_id]) if params[:project_id]
@users = @project ? @project.users : group.users
if @project
@team_member = @project.users_projects.new
end
end
protected

6
app/controllers/team_members_controller.rb
View file

@ -21,7 +21,11 @@ class TeamMembersController < ProjectResourceController
params[:project_access]
)
redirect_to project_team_index_path(@project)
if params[:redirect_to]
redirect_to params[:redirect_to]
else
redirect_to project_team_index_path(@project)
end
end
def update