shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

F #1546: Show quotas in red when limit are exceeded

Browse Source
This commit is contained in:
Abel Coronado 2018-01-18 10:28:17 +01:00 committed by Ruben S. Montero
parent dd7285a23d
commit bb017685aa
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/sunstone/public/app/tabs/provision-tab.js
View File

@ -254,11 +254,21 @@ define(function(require) {
if (!$.isEmptyObject(user.VM_QUOTA)){
if (quotaMem){
$("#quotas-mem", context).text( Humanize.size((parseFloat(user.VM_QUOTA.VM.MEMORY_USED) + parseFloat(values.MEMORY)) * 1024) + " / " + Humanize.size(user.VM_QUOTA.VM.MEMORY * 1024));
if ((parseFloat(values.MEMORY) + parseFloat(user.VM_QUOTA.VM.MEMORY_USED)) > user.VM_QUOTA.VM.MEMORY){
$("#quotas-mem", context).css("color", "red");
} else {
$("#quotas-mem", context).css("color", "black");
}
} else {
$("#quotas-mem", context).text( Humanize.size((parseFloat(user.VM_QUOTA.VM.MEMORY_USED) + parseFloat(values.MEMORY)) * 1024) + " / ∞");
}
if (quotaCpu){
$("#quotas-cpu", context).text(((parseFloat(user.VM_QUOTA.VM.CPU_USED) + parseFloat(values.CPU))).toFixed(2) + " / " + user.VM_QUOTA.VM.CPU);
if ((parseFloat(values.CPU) + parseFloat(user.VM_QUOTA.VM.CPU_USED)) > user.VM_QUOTA.VM.CPU){
$("#quotas-cpu", context).css("color", "red");
} else {
$("#quotas-cpu", context).css("color", "black");
}
} else {
$("#quotas-cpu", context).text(((parseFloat(user.VM_QUOTA.VM.CPU_USED) + parseFloat(values.CPU))).toFixed(2) + " / ∞");
}
@ -328,6 +338,11 @@ define(function(require) {
$("#quotas-disks").text(Humanize.size((parseFloat(this.user.VM_QUOTA.VM.SYSTEM_DISK_SIZE_USED) + totalSize) * 1024) + " / ∞");
} else {
$("#quotas-disks").text(Humanize.size((parseFloat(this.user.VM_QUOTA.VM.SYSTEM_DISK_SIZE_USED) + totalSize) * 1024) + " / " + Humanize.size(parseFloat(this.user.VM_QUOTA.VM.SYSTEM_DISK_SIZE) * 1024));
if ((parseFloat(this.user.VM_QUOTA.VM.SYSTEM_DISK_SIZE_USED) + totalSize) > parseFloat(this.user.VM_QUOTA.VM.SYSTEM_DISK_SIZE)){
$("#quotas-disks", context).css("color", "red");
} else {
$("#quotas-disks", context).css("color", "black");
}
}
}
}

6
src/sunstone/public/app/utils/disks-resize.js
View File

@ -100,8 +100,10 @@ define(function(require){
disksContext.off("change", "input");
if (disk_cost != 0 && Config.isFeatureEnabled("showback")) {
$(".provision_create_template_disk_cost_div", disksContext).show();
if (Config.isFeatureEnabled("showback")) {
if(disk_cost != 0){
$(".provision_create_template_disk_cost_div", disksContext).show();
}
disksContext.on("change", "input", function(){
_calculateCost(disksContext, disk_cost, opts.cost_callback);