Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a567d596
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,发现更多精彩内容 >>
提交
a567d596
编写于
12月 21, 2012
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2305 from gitlabhq/fix_gfm_auto_complete
Fix and refactoring gfm_autocomplete
上级
0efc903e
77d63289
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
22 addition
and
28 deletion
+22
-28
app/assets/javascripts/gfm_auto_complete.js.coffee
app/assets/javascripts/gfm_auto_complete.js.coffee
+7
-27
doc/api/projects.md
doc/api/projects.md
+1
-0
lib/api/projects.rb
lib/api/projects.rb
+6
-1
spec/requests/api/projects_spec.rb
spec/requests/api/projects_spec.rb
+8
-0
未找到文件。
app/assets/javascripts/gfm_auto_complete.js.coffee
浏览文件 @
a567d596
...
...
@@ -13,7 +13,6 @@ GitLab.GfmAutoComplete =
url
:
''
params
:
private_token
:
''
page
:
1
template
:
'<li data-value="${username}">${username} <small>${name}</small></li>'
# Add GFM auto-completion to all input fields, that accept GFM input.
...
...
@@ -29,30 +28,11 @@ GitLab.GfmAutoComplete =
input
.
atWho
'@'
,
tpl
:
@
Members
.
template
callback
:
(
query
,
callback
)
=>
(
getMoreMembers
=
=>
$
.
getJSON
(
@
Members
.
url
,
@
Members
.
params
).
done
(
members
)
=>
# pick the data we need
newMembersData
=
$
.
map
(
members
,
(
m
)
->
username
:
m
.
user
name
name
:
m
.
name
)
request_params
=
$
.
extend
({},
@
Members
.
params
,
query
:
query
)
$
.
getJSON
(
@
Members
.
url
,
request_
params
).
done
(
members
)
=>
new_members_data
=
$
.
map
(
members
,
(
m
)
->
username
:
m
.
username
,
name
:
m
.
name
)
callback
(
new_members_data
)
# add the new page of data to the rest
$
.
merge
(
@
Members
.
data
,
newMembersData
)
# show the pop-up with a copy of the current data
callback
(
@
Members
.
data
[..])
# are we past the last page?
if
newMembersData
.
length
is
0
# set static data and stop callbacks
input
.
atWho
'@'
,
data
:
@
Members
.
data
callback
:
null
else
# get next page
getMoreMembers
()
# so the next callback requests the next page
@
Members
.
params
.
page
+=
1
).
call
()
doc/api/projects.md
浏览文件 @
a567d596
...
...
@@ -126,6 +126,7 @@ GET /projects/:id/members
Parameters:
+
`id`
(required) - The ID or code name of a project
+
`query`
- Query string
## Get project team member
...
...
lib/api/projects.rb
浏览文件 @
a567d596
...
...
@@ -57,10 +57,15 @@ module Gitlab
#
# Parameters:
# id (required) - The ID or code name of a project
# query - Query string
# Example Request:
# GET /projects/:id/members
get
":id/members"
do
@members
=
paginate
user_project
.
users
if
params
[
:query
].
present?
@members
=
paginate
user_project
.
users
.
where
(
"username LIKE ?"
,
"%
#{
params
[
:query
]
}
%"
)
else
@members
=
paginate
user_project
.
users
end
present
@members
,
with:
Entities
::
ProjectMember
,
project:
user_project
end
...
...
spec/requests/api/projects_spec.rb
浏览文件 @
a567d596
...
...
@@ -117,6 +117,14 @@ describe Gitlab::API do
json_response
.
count
.
should
==
2
json_response
.
first
[
'email'
].
should
==
user
.
email
end
it
"finds team members with query string"
do
get
api
(
"/projects/
#{
project
.
path
}
/members"
,
user
),
query:
user
.
username
response
.
status
.
should
==
200
json_response
.
should
be_an
Array
json_response
.
count
.
should
==
1
json_response
.
first
[
'email'
].
should
==
user
.
email
end
end
describe
"GET /projects/:id/members/:user_id"
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录