etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge release branch 4.11 to master 

* 4.11:
  populate project select when clicked on to display latest project options (#2810)
This commit is contained in:
Daan Hoogland 2018-08-20 08:18:45 +00:00
parent 34ada079d3 9b772db0f1
commit 698747683e
1 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
ui/scripts/ui-custom/projectSelect.js
View File

@ -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'));
@ -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));