Merge pull request #2305 from gitlabhq/fix_gfm_auto_complete
Fix and refactoring gfm_autocomplete
This commit is contained in:
commit
a567d596f8
|
@ -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.username
|
||||
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()
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue