Commit 6def9128 authored by Phil Hughes's avatar Phil Hughes

Chganged approverUsers methods to use axios

parent 7c28e4cd
...@@ -182,14 +182,16 @@ const Api = { ...@@ -182,14 +182,16 @@ const Api = {
approverUsers(search, options, callback = $.noop) { approverUsers(search, options, callback = $.noop) {
const url = Api.buildUrl('/autocomplete/users.json'); const url = Api.buildUrl('/autocomplete/users.json');
return $.ajax({ return axios.get(url, {
url, params: Object.assign({
data: $.extend({
search, search,
per_page: 20, per_page: 20,
}, options), }, options),
dataType: 'json', }).then(({ data }) => {
}).done(callback); callback(data);
return data;
});
}, },
ldap_groups(query, provider, callback) { ldap_groups(query, provider, callback) {
......
...@@ -79,9 +79,9 @@ export default class ApproversSelect { ...@@ -79,9 +79,9 @@ export default class ApproversSelect {
query: (query) => { query: (query) => {
const fetchGroups = this.fetchGroups(query.term); const fetchGroups = this.fetchGroups(query.term);
const fetchUsers = this.fetchUsers(query.term); const fetchUsers = this.fetchUsers(query.term);
return $.when(fetchGroups, fetchUsers).then((groups, users) => { return Promise.all([fetchGroups, fetchUsers]).then(([groups, users]) => {
const data = { const data = {
results: groups[0].concat(users[0]), results: groups.concat(users),
}; };
return query.callback(data); return query.callback(data);
}); });
......
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