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
Tatuya Kamada
gitlab-ce
Commits
6aa9c21a
Commit
6aa9c21a
authored
Oct 30, 2015
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix issue with adding members to project (spotted by test)
parent
de990aa1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
2 deletions
+11
-2
app/models/member.rb
app/models/member.rb
+11
-2
No files found.
app/models/member.rb
View file @
6aa9c21a
...
@@ -73,7 +73,7 @@ class Member < ActiveRecord::Base
...
@@ -73,7 +73,7 @@ class Member < ActiveRecord::Base
def
add_user
(
members
,
user_id
,
access_level
,
current_user
=
nil
)
def
add_user
(
members
,
user_id
,
access_level
,
current_user
=
nil
)
user
=
user_for_id
(
user_id
)
user
=
user_for_id
(
user_id
)
# `user` can be either a User object or an email to be invited
# `user` can be either a User object or an email to be invited
if
user
.
is_a?
(
User
)
if
user
.
is_a?
(
User
)
member
=
members
.
find_or_initialize_by
(
user_id:
user
.
id
)
member
=
members
.
find_or_initialize_by
(
user_id:
user
.
id
)
...
@@ -81,13 +81,22 @@ class Member < ActiveRecord::Base
...
@@ -81,13 +81,22 @@ class Member < ActiveRecord::Base
member
=
members
.
build
member
=
members
.
build
member
.
invite_email
=
user
member
.
invite_email
=
user
end
end
if
!
current_user
||
current_user
.
can?
(
:update_group_member
,
member
)
project
=
members
.
first
.
respond_to?
(
:project
)?
members
.
first
.
project
:
nil
if
can_update_member?
(
current_user
,
member
,
project
)
member
.
created_by
||=
current_user
member
.
created_by
||=
current_user
member
.
access_level
=
access_level
member
.
access_level
=
access_level
member
.
save
member
.
save
end
end
end
end
private
def
can_update_member?
(
current_user
,
member
,
project
)
!
current_user
||
current_user
.
can?
(
:update_group_member
,
member
)
||
(
project
&&
current_user
.
can?
(
:admin_project_member
,
project
))
end
end
end
def
invite?
def
invite?
...
...
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