From aa40c7ee98b36370069effb68388ba751d7dc6e5 Mon Sep 17 00:00:00 2001 From: Pranav Saxena Date: Thu, 7 Mar 2013 00:03:30 +0530 Subject: [PATCH] CLOUDSTACK-1407:add primary storage screen throught UI doesn't have scope field --- ui/scripts/system.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ui/scripts/system.js b/ui/scripts/system.js index ac8fe3d8870..4d529aeb04e 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -7725,10 +7725,13 @@ var clusterName = args.data.name; - if(args.data.cpuovercommit != "") - array1.push("&cpuovercommitratio=" + todb(args.data.cpuovercommit)); + if(args.data.cpuovercommit != "" && args.data.cpuovercommit > 0 ){ + + array1.push("&cpuovercommitratio=" + todb(args.data.cpuovercommit)); - if(args.data.memoryovercommit != "") + } + + if(args.data.memoryovercommit != "" && args.data.memoryovercommit > 0) array1.push("&memoryovercommitratio=" + todb(args.data.memoryovercommit)); if(args.data.hypervisor == "VMware") { @@ -8989,7 +8992,7 @@ label: 'label.scope', select: function(args) { var scope = [ - { id: 'zone-wide', description: _l('label.zone.wide') }, + { id: 'zone', description: _l('label.zone.wide') }, { id: 'cluster', description: _l('label.cluster') }, { id: 'host', description: _l('label.host') } ]; @@ -9002,7 +9005,7 @@ var $form = $(this).closest('form'); var scope = $(this).val(); - if(scope == 'zone-wide'){ + if(scope == 'zone'){ $form.find('.form-item[rel=podId]').hide(); $form.find('.form-item[rel=clusterId]').hide(); $form.find('.form-item[rel=hostId]').hide();