You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2012/12/05 01:06:59 UTC

[1/5] git commit: Fix updateZone fail if guest CIDR field is blank

Updated Branches:
  refs/heads/master 0902f60c6 -> 132114179


Fix updateZone fail if guest CIDR field is blank


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

Branch: refs/heads/master
Commit: 13211417976fa1b6c5dd8b7e3ddd95ab21486082
Parents: 5f1f1e7
Author: Brian Federle <br...@citrix.com>
Authored: Tue Dec 4 11:33:43 2012 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Dec 4 11:33:43 2012 -0800

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


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13211417/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 516111b..589739b 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -4348,8 +4348,11 @@
                       array1.push("&name="  +todb(args.data.name));
                       array1.push("&dns1=" + todb(args.data.dns1));
                       array1.push("&dns2=" + todb(args.data.dns2));  //dns2 can be empty ("") when passed to API
-                      if(selectedZoneObj.networktype == "Advanced"){
-                      array1.push("&guestcidraddress=" +todb(args.data.guestcidraddress)); }                                                                         
+                      
+                      if (selectedZoneObj.networktype == "Advanced" && args.data.guestcidraddress) {
+                        array1.push("&guestcidraddress=" + todb(args.data.guestcidraddress));
+                      }
+                      
                       array1.push("&internaldns1=" + todb(args.data.internaldns1));
                       array1.push("&internaldns2=" + todb(args.data.internaldns2));  //internaldns2 can be empty ("") when passed to API
                       array1.push("&domain=" + todb(args.data.domain));