Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
39ab7527
Commit
39ab7527
authored
Sep 15, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix project member management
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
bdbadebe
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/models/project_team.rb
app/models/project_team.rb
+1
-1
app/views/projects/team_members/_form.html.haml
app/views/projects/team_members/_form.html.haml
+1
-1
app/views/projects/team_members/_team_member.html.haml
app/views/projects/team_members/_team_member.html.haml
+1
-1
No files found.
app/models/project_team.rb
View file @
39ab7527
...
@@ -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
...
...
app/views/projects/team_members/_form.html.haml
View file @
39ab7527
%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
...
...
app/views/projects/team_members/_team_member.html.haml
View file @
39ab7527
...
@@ -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"
=
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment