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

B #1619: Error retrieve VMGroup

Browse Source
This commit is contained in:
Abel Coronado 2018-01-02 15:10:22 +01:00 committed by Ruben S. Montero
parent d019485e3d
commit e2673e8322
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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