Commit 39ab7527 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix project member management

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent bdbadebe
...@@ -102,7 +102,7 @@ class ProjectTeam ...@@ -102,7 +102,7 @@ class ProjectTeam
source_team.map! do |tm| source_team.map! do |tm|
new_tm = tm.dup new_tm = tm.dup
new_tm.id = nil new_tm.id = nil
new_tm.project_id = target_project.id new_tm.source = target_project
new_tm new_tm
end end
......
%h3.page-title %h3.page-title
New project member(s) 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? -if @user_project_relation.errors.any?
.alert.alert-danger .alert.alert-danger
%ul %ul
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
- if current_user_can_admin_project - if current_user_can_admin_project
- unless @project.personal? && user == current_user - unless @project.personal? && user == current_user
.pull-left .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" = f.select :access_level, options_for_select(ProjectMember.access_roles, member.access_level), {}, class: "medium project-access-select span2 trigger-submit"
&nbsp; &nbsp;
= 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 = 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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment