Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6aa9c21a
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6aa9c21a
编写于
10月 30, 2015
作者:
J
James Lopez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix issue with adding members to project (spotted by test)
上级
de990aa1
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
11 addition
and
2 deletion
+11
-2
app/models/member.rb
app/models/member.rb
+11
-2
未找到文件。
app/models/member.rb
浏览文件 @
6aa9c21a
...
...
@@ -73,7 +73,7 @@ class Member < ActiveRecord::Base
def
add_user
(
members
,
user_id
,
access_level
,
current_user
=
nil
)
user
=
user_for_id
(
user_id
)
# `user` can be either a User object or an email to be invited
if
user
.
is_a?
(
User
)
member
=
members
.
find_or_initialize_by
(
user_id:
user
.
id
)
...
...
@@ -81,13 +81,22 @@ class Member < ActiveRecord::Base
member
=
members
.
build
member
.
invite_email
=
user
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
.
access_level
=
access_level
member
.
save
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
def
invite?
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录