diff options
| author | Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com> | 2015-05-12 13:32:35 +0200 |
|---|---|---|
| committer | Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com> | 2015-05-18 10:06:54 +0200 |
| commit | 6558440736ca0053d98aa289c92563181dc4be80 (patch) | |
| tree | a2b2ab441ebfdb9646e56cb81a16091e91464d99 /server/sonar-web/src/main/coffee/issues | |
| parent | 5a92a8bd1b28dde9f2a1f50af53dcc03cec383ab (diff) | |
| download | sonarqube-6558440736ca0053d98aa289c92563181dc4be80.tar.gz sonarqube-6558440736ca0053d98aa289c92563181dc4be80.zip | |
SONAR-6520 Replace call api/users/search2 instead of api/users/search on frontend
Diffstat (limited to 'server/sonar-web/src/main/coffee/issues')
3 files changed, 30 insertions, 9 deletions
diff --git a/server/sonar-web/src/main/coffee/issues/facets/assignee-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/assignee-facet.coffee index 673cb5db44c..dfeb669741c 100644 --- a/server/sonar-web/src/main/coffee/issues/facets/assignee-facet.coffee +++ b/server/sonar-web/src/main/coffee/issues/facets/assignee-facet.coffee @@ -33,8 +33,18 @@ define [ getUrl: -> - "#{baseUrl}/api/users/search?f=s2" - + "#{baseUrl}/api/users/search2" + + prepareAjaxSearch: -> + quietMillis: 300 + url: @getUrl() + data: (term, page) -> { q: term, p: page } + results: (data) -> + more: false, + results: _.map(data.users, (user) -> + id: user.login, + text: "#{user.name} (#{user.login})" + ) onRender: -> super diff --git a/server/sonar-web/src/main/coffee/issues/facets/custom-values-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/custom-values-facet.coffee index ce07db1db43..2cb99e56876 100644 --- a/server/sonar-web/src/main/coffee/issues/facets/custom-values-facet.coffee +++ b/server/sonar-web/src/main/coffee/issues/facets/custom-values-facet.coffee @@ -52,12 +52,13 @@ define [ formatSearching: -> t 'select2.searching' formatInputTooShort: -> tp 'select2.tooShort', 2 width: '100%' - ajax: - quietMillis: 300 - url: @getUrl() - data: (term, page) -> { s: term, p: page } - results: (data) -> { more: data.more, results: data.results } + ajax: @prepareAjaxSearch() + prepareAjaxSearch: -> + quietMillis: 300 + url: @getUrl() + data: (term, page) -> { s: term, p: page } + results: (data) -> { more: data.more, results: data.results } addCustomValue: -> property = @model.get 'property' diff --git a/server/sonar-web/src/main/coffee/issues/facets/reporter-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/reporter-facet.coffee index 0de88bb7ba8..af5be0934e7 100644 --- a/server/sonar-web/src/main/coffee/issues/facets/reporter-facet.coffee +++ b/server/sonar-web/src/main/coffee/issues/facets/reporter-facet.coffee @@ -28,8 +28,18 @@ define [ class extends CustomValuesFacet getUrl: -> - "#{baseUrl}/api/users/search?f=s2" - + "#{baseUrl}/api/users/search2" + + prepareAjaxSearch: -> + quietMillis: 300 + url: @getUrl() + data: (term, page) -> { q: term, p: page } + results: (data) -> + more: false, + results: _.map(data.users, (user) -> + id: user.login, + text: "#{user.name} (#{user.login})" + ) getValuesWithLabels: -> values = @model.getValues() |