diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-15 11:04:25 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-15 11:04:25 +0300 |
| commit | 39ab7527d41c2351b82398947307f3d668f06944 (patch) | |
| tree | 4f2403893dc8a75af4a62774f6e1ded792022fae /app | |
| parent | bdbadebe3e6e25180d8c1465dde4573fa0ecc389 (diff) | |
| download | gitlab-ce-39ab7527d41c2351b82398947307f3d668f06944.tar.gz | |
Fix project member management
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/project_team.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/team_members/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/team_members/_team_member.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/models/project_team.rb b/app/models/project_team.rb index 330e2aa728c..e2af10c6899 100644 --- a/app/models/project_team.rb +++ b/app/models/project_team.rb @@ -102,7 +102,7 @@ class ProjectTeam source_team.map! do |tm| new_tm = tm.dup new_tm.id = nil - new_tm.project_id = target_project.id + new_tm.source = target_project new_tm end diff --git a/app/views/projects/team_members/_form.html.haml b/app/views/projects/team_members/_form.html.haml index 7e3fe02e198..2bf61fa12bb 100644 --- a/app/views/projects/team_members/_form.html.haml +++ b/app/views/projects/team_members/_form.html.haml @@ -1,7 +1,7 @@ %h3.page-title New project member(s) -= form_for @user_project_relation, as: :team_member, url: project_team_members_path(@project), html: { class: "form-horizontal users-project-form" } do |f| += form_for @user_project_relation, as: :project_member, url: project_team_members_path(@project), html: { class: "form-horizontal users-project-form" } do |f| -if @user_project_relation.errors.any? .alert.alert-danger %ul diff --git a/app/views/projects/team_members/_team_member.html.haml b/app/views/projects/team_members/_team_member.html.haml index 3ecbf129083..79b78665417 100644 --- a/app/views/projects/team_members/_team_member.html.haml +++ b/app/views/projects/team_members/_team_member.html.haml @@ -4,7 +4,7 @@ - if current_user_can_admin_project - unless @project.personal? && user == current_user .pull-left - = form_for(member, as: :team_member, url: project_team_member_path(@project, member.user)) do |f| + = form_for(member, as: :project_member, url: project_team_member_path(@project, member.user)) do |f| = f.select :access_level, options_for_select(ProjectMember.access_roles, member.access_level), {}, class: "medium project-access-select span2 trigger-submit" = link_to project_team_member_path(@project, user), data: { confirm: remove_from_project_team_message(@project, user)}, method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from team' do |