Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
aa464800
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,发现更多精彩内容 >>
未验证
提交
aa464800
编写于
2月 15, 2019
作者:
L
Luke Bennett
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add type property to project autocomplete members
上级
1cd080c7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
47 addition
and
6 deletion
+47
-6
app/services/concerns/users/participable_service.rb
app/services/concerns/users/participable_service.rb
+9
-6
spec/controllers/projects/autocomplete_sources_controller_spec.rb
...trollers/projects/autocomplete_sources_controller_spec.rb
+38
-0
未找到文件。
app/services/concerns/users/participable_service.rb
浏览文件 @
aa464800
...
...
@@ -11,7 +11,7 @@ module Users
def
noteable_owner
return
[]
unless
noteable
&&
noteable
.
author
.
present?
[
as_hash
(
noteable
.
author
)]
[
user_
as_hash
(
noteable
.
author
)]
end
def
participants_in_noteable
...
...
@@ -23,21 +23,24 @@ module Users
def
sorted
(
users
)
users
.
uniq
.
to_a
.
compact
.
sort_by
(
&
:username
).
map
do
|
user
|
as_hash
(
user
)
user_
as_hash
(
user
)
end
end
def
groups
current_user
.
authorized_groups
.
sort_by
(
&
:path
).
map
do
|
group
|
count
=
group
.
users
.
count
{
username:
group
.
full_path
,
name:
group
.
full_name
,
count:
count
,
avatar_url:
group
.
avatar_url
}
group_as_hash
(
group
)
end
end
private
def
as_hash
(
user
)
{
username:
user
.
username
,
name:
user
.
name
,
avatar_url:
user
.
avatar_url
}
def
user_as_hash
(
user
)
{
type:
user
.
class
.
name
,
username:
user
.
username
,
name:
user
.
name
,
avatar_url:
user
.
avatar_url
}
end
def
group_as_hash
(
group
)
{
type:
group
.
class
.
name
,
username:
group
.
full_path
,
name:
group
.
full_name
,
avatar_url:
group
.
avatar_url
,
count:
group
.
users
.
count
}
end
end
end
spec/controllers/projects/autocomplete_sources_controller_spec.rb
0 → 100644
浏览文件 @
aa464800
# frozen_string_literal: true
require
'spec_helper'
describe
Projects
::
AutocompleteSourcesController
do
set
(
:group
)
{
create
(
:group
)
}
set
(
:project
)
{
create
(
:project
,
namespace:
group
)
}
set
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
set
(
:user
)
{
create
(
:user
)
}
describe
'GET members'
do
before
do
group
.
add_owner
(
user
)
sign_in
(
user
)
end
it
'returns an array of member object'
do
get
:members
,
format: :json
,
params:
{
namespace_id:
group
.
path
,
project_id:
project
.
path
,
type:
issue
.
class
.
name
,
type_id:
issue
.
id
}
all
=
json_response
.
find
{
|
member
|
member
[
"username"
]
==
'all'
}
the_group
=
json_response
.
find
{
|
member
|
member
[
"username"
]
==
group
.
full_path
}
the_user
=
json_response
.
find
{
|
member
|
member
[
"username"
]
==
user
.
username
}
expect
(
all
.
symbolize_keys
).
to
include
(
username:
'all'
,
name:
'All Project and Group Members'
,
count:
1
)
expect
(
the_group
.
symbolize_keys
).
to
include
(
type:
group
.
class
.
name
,
name:
group
.
full_name
,
avatar_url:
group
.
avatar_url
,
count:
1
)
expect
(
the_user
.
symbolize_keys
).
to
include
(
type:
user
.
class
.
name
,
name:
user
.
name
,
avatar_url:
user
.
avatar_url
)
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录