Commit a567d596 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #2305 from gitlabhq/fix_gfm_auto_complete

Fix and refactoring gfm_autocomplete
parents 0efc903e 77d63289
...@@ -13,7 +13,6 @@ GitLab.GfmAutoComplete = ...@@ -13,7 +13,6 @@ GitLab.GfmAutoComplete =
url: '' url: ''
params: params:
private_token: '' private_token: ''
page: 1
template: '<li data-value="${username}">${username} <small>${name}</small></li>' template: '<li data-value="${username}">${username} <small>${name}</small></li>'
# Add GFM auto-completion to all input fields, that accept GFM input. # Add GFM auto-completion to all input fields, that accept GFM input.
...@@ -29,30 +28,11 @@ GitLab.GfmAutoComplete = ...@@ -29,30 +28,11 @@ GitLab.GfmAutoComplete =
input.atWho '@', input.atWho '@',
tpl: @Members.template tpl: @Members.template
callback: (query, callback) => callback: (query, callback) =>
(getMoreMembers = => request_params = $.extend({}, @Members.params, query: query)
$.getJSON(@Members.url, @Members.params).done (members) => $.getJSON(@Members.url, request_params).done (members) =>
# pick the data we need new_members_data = $.map(members, (m) ->
newMembersData = $.map(members, (m) -> username: m.username,
username: m.username
name: m.name 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 ...@@ -126,6 +126,7 @@ GET /projects/:id/members
Parameters: Parameters:
+ `id` (required) - The ID or code name of a project + `id` (required) - The ID or code name of a project
+ `query` - Query string
## Get project team member ## Get project team member
......
...@@ -57,10 +57,15 @@ module Gitlab ...@@ -57,10 +57,15 @@ module Gitlab
# #
# Parameters: # Parameters:
# id (required) - The ID or code name of a project # id (required) - The ID or code name of a project
# query - Query string
# Example Request: # Example Request:
# GET /projects/:id/members # GET /projects/:id/members
get ":id/members" do get ":id/members" do
if params[:query].present?
@members = paginate user_project.users.where("username LIKE ?", "%#{params[:query]}%")
else
@members = paginate user_project.users @members = paginate user_project.users
end
present @members, with: Entities::ProjectMember, project: user_project present @members, with: Entities::ProjectMember, project: user_project
end end
......
...@@ -117,6 +117,14 @@ describe Gitlab::API do ...@@ -117,6 +117,14 @@ describe Gitlab::API do
json_response.count.should == 2 json_response.count.should == 2
json_response.first['email'].should == user.email json_response.first['email'].should == user.email
end 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 end
describe "GET /projects/:id/members/:user_id" do describe "GET /projects/:id/members/:user_id" do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment