Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

Commit 2156633

Browse files
authored
Merge branch 'dev' into use_challenge_service_v3
2 parents d455a80 + c9769ba commit 2156633

File tree

4 files changed

+22
-15
lines changed

4 files changed

+22
-15
lines changed

src/web/scripts/editCockpitProject.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -305,18 +305,19 @@ $(document).ready(function (e) {
305305
if (typeof(q) === 'string' && q.length > 0) {
306306
$.ajax({
307307
type: 'GET',
308-
url: member_api_url,
308+
url: member_api_url + q,
309309
cache: false,
310310
dataType: 'json',
311311
contentType: 'application/json; charset=utf-8',
312-
data: {'handle': q},
313312
async: false,
314313
success: function (result) {
315-
$.each(result['result']['content'], function (index, member) {
316-
if ($.inArray(member['handle'], currentList) < 0){
317-
members.push({'id': member['userId'].toString(), 'name': member['handle']});
318-
}
319-
});
314+
if (typeof(result['result']) !== 'undefined') {
315+
$.each(result['result']['content'], function (index, member) {
316+
if ($.inArray(member['handle'], currentList) < 0) {
317+
members.push({'id': member['userId'].toString(), 'name': member['handle']});
318+
}
319+
});
320+
}
320321
},
321322
error: function () {
322323
throw("Problem getting members");

src/web/scripts/launch/main.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -254,16 +254,20 @@ $(document).ready(function() {
254254
if (typeof(q) === 'string' && q.length > 0) {
255255
$.ajax({
256256
type: 'GET',
257-
url: member_api_url,
257+
url: member_api_url + q,
258258
cache: false,
259259
dataType: 'json',
260260
contentType: 'application/json; charset=utf-8',
261-
data: {'handle': q},
262261
async: false,
263262
success: function (result) {
264-
$.each(result['result']['content'], function (index, member) {
265-
members.push({'id': member['userId'].toString(), 'name': member['handle']});
266-
});
263+
if (typeof(result['result']) !== 'undefined') {
264+
$.each(result['result']['content'], function (index, member) {
265+
members.push({
266+
'id': member['userId'].toString(),
267+
'name': member['handle']
268+
});
269+
});
270+
}
267271
},
268272
error: function () {
269273
throw("Problem getting members");

token.properties.docker

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,5 +359,6 @@
359359
@ApplicationServer.JWT_V3_COOKIE_KEY@=v3jwt
360360
@ApplicationServer.DIRECT_API_SERVICE_ENDPOINT@= direct.dev.topcoder.com/direct/api/v2/
361361

362-
@memberSearchApiUrl@=https://tc-api.cloud.topcoder.com:8443/v3/members/_search/?query=MEMBER_SEARCH&offset=0&limit=10
362+
@memberSearchApiUrl@=https://tc-api.cloud.topcoder.com:8443/v3/members/_suggest/
363363
@directChallengeServicesApiUrl@=http://api.topcoder-dev.com/v3/direct/challenges
364+

token.properties.example

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,5 +416,6 @@
416416
@LDAP_AUTH0_CONNECTION_NAME@=vm-ldap-connection
417417
@member.profile.url.base@=http://tc.cloud.topcoder.com
418418

419-
@memberSearchApiUrl@=https://tc-api.cloud.topcoder.com:8443/v3/members/_search/?query=MEMBER_SEARCH&offset=0&limit=10
420-
@directChallengeServicesApiUrl@=http://api.topcoder-dev.com/v3/direct/challenges
419+
@memberSearchApiUrl@=https://tc-api.cloud.topcoder.com:8443/v3/members/_suggest/
420+
@directChallengeServicesApiUrl@=http://api.topcoder-dev.com/v3/direct/challenges
421+

0 commit comments

Comments
 (0)