Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
70997dea
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,发现更多精彩内容 >>
提交
70997dea
编写于
2月 23, 2017
作者:
R
Rémy Coutable
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'api-remove-attributes_for_keys' into 'master'
Use grape validation in the members API. See merge request !9471
上级
f6443a45
da67dca1
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
6 addition
and
8 deletion
+6
-8
lib/api/members.rb
lib/api/members.rb
+3
-4
lib/api/v3/members.rb
lib/api/v3/members.rb
+3
-4
未找到文件。
lib/api/members.rb
浏览文件 @
70997dea
...
...
@@ -79,13 +79,12 @@ module API
optional
:expires_at
,
type:
DateTime
,
desc:
'Date string in the format YEAR-MONTH-DAY'
end
put
":id/members/:user_id"
do
source
=
find_source
(
source_type
,
params
[
:id
]
)
source
=
find_source
(
source_type
,
params
.
delete
(
:id
)
)
authorize_admin_source!
(
source_type
,
source
)
member
=
source
.
members
.
find_by!
(
user_id:
params
[
:user_id
])
attrs
=
attributes_for_keys
[
:access_level
,
:expires_at
]
member
=
source
.
members
.
find_by!
(
user_id:
params
.
delete
(
:user_id
))
if
member
.
update_attributes
(
attrs
)
if
member
.
update_attributes
(
declared_params
(
include_missing:
false
)
)
present
member
.
user
,
with:
Entities
::
Member
,
member:
member
else
# This is to ensure back-compatibility but 400 behavior should be used
...
...
lib/api/v3/members.rb
浏览文件 @
70997dea
...
...
@@ -86,13 +86,12 @@ module API
optional
:expires_at
,
type:
DateTime
,
desc:
'Date string in the format YEAR-MONTH-DAY'
end
put
":id/members/:user_id"
do
source
=
find_source
(
source_type
,
params
[
:id
]
)
source
=
find_source
(
source_type
,
params
.
delete
(
:id
)
)
authorize_admin_source!
(
source_type
,
source
)
member
=
source
.
members
.
find_by!
(
user_id:
params
[
:user_id
])
attrs
=
attributes_for_keys
[
:access_level
,
:expires_at
]
member
=
source
.
members
.
find_by!
(
user_id:
params
.
delete
(
:user_id
))
if
member
.
update_attributes
(
attrs
)
if
member
.
update_attributes
(
declared_params
(
include_missing:
false
)
)
present
member
.
user
,
with:
::
API
::
Entities
::
Member
,
member:
member
else
# This is to ensure back-compatibility but 400 behavior should be used
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录