Skip to content

Project drop-down refresh data fix #2810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 1 commit into from
Aug 20, 2018
Merged

Project drop-down refresh data fix #2810

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 32 additions & 23 deletions ui/scripts/ui-custom/projectSelect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,33 +24,35 @@
);
var $label = $('<label>').html(_l('label.project'));

// Get project list
cloudStack.projects.dataProvider({
context: cloudStack.context,
response: {
success: function(args) {
var projects = args.data;
var arrayOfProjs = [];
var populateProjectSelect = function() {
// Get project list
cloudStack.projects.dataProvider({
context: cloudStack.context,
response: {
success: function(args) {
var projects = args.data;
var arrayOfProjs = [];

$(projects).map(function(index, project) {
var proj = {id: _s(project.id), html: _s(project.displaytext ? project.displaytext : project.name)};
arrayOfProjs.push(proj);
});
$(projects).map(function(index, project) {
var proj = {id: _s(project.id), html: _s(project.displaytext ? project.displaytext : project.name)};
arrayOfProjs.push(proj);
});

arrayOfProjs.sort(function(a,b) {
return a.html.localeCompare(b.html);
});
arrayOfProjs.sort(function(a,b) {
return a.html.localeCompare(b.html);
});

$(arrayOfProjs).map(function(index, project) {
var $option = $('<option>').val(_s(project.id));
$(arrayOfProjs).map(function(index, project) {
var $option = $('<option>').val(_s(project.id));

$option.html(_s(project.html));
$option.appendTo($projectSelect);
});
},
error: function() {}
}
});
$option.html(_s(project.html));
$option.appendTo($projectSelect);
});
},
error: function() {}
}
});
}

$projectSwitcher.append($label, $projectSelect);
$projectSwitcher.insertBefore($header.find('.region-switcher'));
Expand All @@ -73,5 +75,12 @@
$('#navigation li.dashboard').click();
}
});

$projectSelect.mousedown(function() {
var projectID = $projectSelect.val();
$('.project-switcher option:not(:first)').remove();
populateProjectSelect();
$projectSelect.val(projectID);
});
});
}(jQuery, cloudStack));