From e2673e8322143a50712e24ba0d3f5b8041c2cbd6 Mon Sep 17 00:00:00 2001 From: Abel Coronado Date: Tue, 2 Jan 2018 15:10:22 +0100 Subject: [PATCH] B #1619: Error retrieve VMGroup --- src/sunstone/public/app/tabs/provision-tab.js | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/sunstone/public/app/tabs/provision-tab.js b/src/sunstone/public/app/tabs/provision-tab.js index b583f1b2a3..e3ee24d9b8 100644 --- a/src/sunstone/public/app/tabs/provision-tab.js +++ b/src/sunstone/public/app/tabs/provision-tab.js @@ -251,15 +251,17 @@ define(function(require) { if (!values.CPU){ values.CPU = 0; } - 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)); - } 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); - } else { - $("#quotas-cpu", context).text(((parseFloat(user.VM_QUOTA.VM.CPU_USED) + parseFloat(values.CPU))).toFixed(2) + " / ∞"); + 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)); + } 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); + } else { + $("#quotas-cpu", context).text(((parseFloat(user.VM_QUOTA.VM.CPU_USED) + parseFloat(values.CPU))).toFixed(2) + " / ∞"); + } } }); @@ -319,7 +321,7 @@ define(function(require) { $(".total_cost_div .cost_value", context).text( (total).toFixed(2) ); } - if (Config.provision.dashboard.isEnabled("quotas")) { + if (Config.provision.dashboard.isEnabled("quotas") && !$.isEmptyObject(user.VM_QUOTA)) { if (!$("#quotas-disks").text().includes("/")){ var totalSize = parseFloat($("#quotas-disks").text()); if (this.user.VM_QUOTA.VM.SYSTEM_DISK_SIZE === "-1" || this.user.VM_QUOTA.VM.SYSTEM_DISK_SIZE === "-2"){ @@ -1028,7 +1030,7 @@ define(function(require) { cost_callback: _calculateCost, uinput_mb: true }); - if (Config.provision.dashboard.isEnabled("quotas")) { + if (Config.provision.dashboard.isEnabled("quotas") && !$.isEmptyObject(user.VM_QUOTA)) { $("#quotas-disks").show(); if (this.user.VM_QUOTA.VM.SYSTEM_DISK_SIZE === "-1" || this.user.VM_QUOTA.VM.SYSTEM_DISK_SIZE === "-2"){ $("#quotas-disks").text(Humanize.size(parseFloat(this.user.VM_QUOTA.VM.SYSTEM_DISK_SIZE_USED) * 1024) + " / " + "∞"); @@ -1140,7 +1142,7 @@ define(function(require) { } }; - var vmgroup = VMGroupSection.retrieve($(".vmgroupContext"+ template_id)); + var vmgroup = VMGroupSection.retrieve($(".vmgroupContext", context)); if(vmgroup){ $.extend(extra_info.template, vmgroup);