cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pran...@apache.org
Subject git commit: updated refs/heads/UI-explicitDedication to b4e2962
Date Thu, 30 May 2013 12:39:21 GMT
Updated Branches:
  refs/heads/UI-explicitDedication 22ff6bb2e -> b4e296213


Explicit Dedication : Zone


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

Branch: refs/heads/UI-explicitDedication
Commit: b4e2962138b607d56d5ba94fd0ea3556475a33b5
Parents: 22ff6bb
Author: Pranav Saxena <pranav.saxena@citrix.com>
Authored: Thu May 30 18:08:04 2013 +0530
Committer: Pranav Saxena <pranav.saxena@citrix.com>
Committed: Thu May 30 18:08:04 2013 +0530

----------------------------------------------------------------------
 ui/scripts/zoneWizard.js |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b4e29621/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 7dad2b8..f5804ce 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -348,11 +348,18 @@
           
 	  }													
 										
-          setTimeout(function() {
+      /*    setTimeout(function() {
             if ($form.find('input[name=ispublic]').is(':checked')) {
-              $form.find('[rel=domain]').hide();
+              $form.find('[rel=domain]').show();
+              $form.find('[rel=accountId]').show();
             }
-          });
+ 
+            else{
+
+              $form.find('[rel=domain]').hide();
+              $form.find('[rel=accountId]').hide();
+             }             
+          });*/
         },
         fields: {
           name: {
@@ -542,7 +549,7 @@
             validation: { required: false }
           },
           ispublic: {
-            isReverse: true,
+            //isReverse: true,
             isBoolean: true,
             label: 'Dedicate',
             isChecked: false //checked by default (public zone)
@@ -674,7 +681,7 @@
 					gslbprovider: {
             label: 'GSLB service',
             isBoolean: true,
-            isChecked: true
+            isChecked: false
           },
 					gslbproviderpublicip: {
             label: 'GSLB service Public IP'
@@ -1598,8 +1605,10 @@
             array1.push("&internaldns2=" + todb(internaldns2));
 
 					if(args.data.pluginFrom == null) { //from zone wizard, not from quick instsaller(args.data.pluginFrom
!= null && args.data.pluginFrom.name == 'installWizard') who doesn't have public checkbox
-					//	if(args.data.zone.ispublic != null) //public checkbox in zone wizard is unchecked

+					//	if(args.data.zone.ispublic != null){ //public checkbox in zone wizard is unchecked

 					//		array1.push("&domainid=" + args.data.zone.domain);
+                                                       
+                                              // }
           }
 					
           if(args.data.zone.networkdomain != null && args.data.zone.networkdomain.length
> 0)
@@ -1623,13 +1632,13 @@
                 if(args.data.pluginFrom == null && args.data.zone.ispublic != null){
                       var array2 = [];
                       if(args.data.zone.domain != null)
-                         array2.push("&domainid=" + args.data.zone.domain);
+                        array2.push("&domainid=" + args.data.zone.domain);
                       if(args.data.zone.accountId != "")
                         array2.push("&accountId=" +todb(args.data.zone.accountId));
 
                       if(dedicatedZoneId != null){
                       $.ajax({
-                         url:createURL("dedicateZone&ZoneId=" +dedicatedZoneId +"&domain="
+args.data.zone.domain + array2.join("")),
+                         url:createURL("dedicateZone&ZoneId=" +dedicatedZoneId + array2.join("")),
                          dataType:"json",
                          success:function(json){
                              var dedicatedObj = json.dedicatezoneresponse.jobid;


Mime
View raw message