Skip to content

Commit cb60b0a

Browse files
author
Jessica Wang
committed
CLOUDSTACK-7634: UI > Project Dropdown on top menu > not all projects are populated when there are more than 500 projects in database.
1 parent 44a4158 commit cb60b0a

1 file changed

Lines changed: 35 additions & 24 deletions

File tree

ui/scripts/projects.js

Lines changed: 35 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -621,37 +621,48 @@
621621
},
622622

623623
// Project listing data provider
624-
dataProvider: function(args) {
624+
dataProvider: function(args) {
625625
var user = args.context.users[0];
626-
var data = {
626+
var data1 = {
627627
accountId: user.userid,
628628
listAll: true
629629
};
630-
631630
if (args.projectName) {
632-
data.keyword = args.projectName;
631+
data1.keyword = args.projectName;
633632
}
634633

635-
$.ajax({
636-
url: createURL('listProjects', {
637-
ignoreProject: true
638-
}),
639-
data: data,
640-
dataType: 'json',
641-
async: true,
642-
success: function(data) {
643-
args.response.success({
644-
data: $.map(
645-
data.listprojectsresponse.project ?
646-
data.listprojectsresponse.project : [],
647-
function(elem) {
648-
return $.extend(elem, {
649-
displayText: elem.displaytext
650-
});
651-
})
652-
});
653-
}
654-
});
634+
var array1 = [];
635+
var page = 1;
636+
var getNextPage = function() {
637+
var data2 = $.extend({}, data1, {
638+
page: page,
639+
pageSize: 500
640+
});
641+
642+
$.ajax({
643+
url: createURL('listProjects', {
644+
ignoreProject: true
645+
}),
646+
data: data2,
647+
async: false,
648+
success: function(json) {
649+
var projects = json.listprojectsresponse.project;
650+
if (projects != undefined) {
651+
for(var i = 0; i < projects.length; i++) {
652+
array1.push($.extend(projects[i], {
653+
displayText: projects[i].displaytext
654+
}));
655+
}
656+
}
657+
if (array1.length < json.listprojectsresponse.count) {
658+
page++;
659+
getNextPage();
660+
}
661+
}
662+
});
663+
}
664+
getNextPage();
665+
args.response.success({ data: array1 });
655666
}
656667
};
657668

0 commit comments

Comments
 (0)