cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From muralire...@apache.org
Subject [6/50] [abbrv] git commit: refs/heads/gslb-wip - CLOUDSTACK-1407:add primary storage screen throught UI doesn't have scope field
Date Mon, 18 Mar 2013 10:14:50 GMT
CLOUDSTACK-1407:add primary storage screen throught UI doesn't have scope field


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/aa40c7ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/aa40c7ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/aa40c7ee

Branch: refs/heads/gslb-wip
Commit: aa40c7ee98b36370069effb68388ba751d7dc6e5
Parents: 5b6a4a6
Author: Pranav Saxena <pranav.saxena@citrix.com>
Authored: Thu Mar 7 00:03:30 2013 +0530
Committer: Pranav Saxena <pranav.saxena@citrix.com>
Committed: Thu Mar 7 00:03:30 2013 +0530

----------------------------------------------------------------------
 ui/scripts/system.js |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/aa40c7ee/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index ac8fe3d..4d529ae 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();


Mime
View raw message