cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject git commit: updated refs/heads/object_store to 66337e8
Date Tue, 07 May 2013 21:24:49 GMT
Updated Branches:
  refs/heads/object_store 7e47b983f -> 66337e8e9


Zone wizard: fix secondary storage dropdown event


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

Branch: refs/heads/object_store
Commit: 66337e8e9cd92196b5f706bbce5abf93661c12b5
Parents: 7e47b98
Author: Brian Federle <brian.federle@citrix.com>
Authored: Tue May 7 14:24:39 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Tue May 7 14:24:39 2013 -0700

----------------------------------------------------------------------
 ui/scripts/zoneWizard.js |   94 +++++++++++++++++++++--------------------
 1 files changed, 48 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/66337e8e/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 03339fb..9122793 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -1526,73 +1526,75 @@
                     data: items            
                   });
                                     
-                  args.$select.change(function() {                           
+                  args.$select.change(function() {
                     var $form = $(this).closest('form');
+                    var $fields = $form.find('.field');
+
                     if($(this).val() == "NFS") {
                       //NFS
-                      $form.find('.form-item[rel=zoneid]').css('display', 'inline-block');
-                      $form.find('.form-item[rel=nfsServer]').css('display', 'inline-block');
-                      $form.find('.form-item[rel=path]').css('display', 'inline-block');
+                      $fields.filter('[rel=zoneid]').css('display', 'inline-block');
+                      $fields.filter('[rel=nfsServer]').css('display', 'inline-block');
+                      $fields.filter('[rel=path]').css('display', 'inline-block');
 
                       //S3
-                      $form.find('.form-item[rel=accesskey]').hide();
-                      $form.find('.form-item[rel=secretkey]').hide();
-                      $form.find('.form-item[rel=bucket]').hide();
-                      $form.find('.form-item[rel=endpoint]').hide();
-                      $form.find('.form-item[rel=usehttps]').hide();
-                      $form.find('.form-item[rel=connectiontimeout]').hide();
-                      $form.find('.form-item[rel=maxerrorretry]').hide();
-                      $form.find('.form-item[rel=sockettimeout]').hide();
+                      $fields.filter('[rel=accesskey]').hide();
+                      $fields.filter('[rel=secretkey]').hide();
+                      $fields.filter('[rel=bucket]').hide();
+                      $fields.filter('[rel=endpoint]').hide();
+                      $fields.filter('[rel=usehttps]').hide();
+                      $fields.filter('[rel=connectiontimeout]').hide();
+                      $fields.filter('[rel=maxerrorretry]').hide();
+                      $fields.filter('[rel=sockettimeout]').hide();
 
                       //Swift
-                      $form.find('.form-item[rel=url]').hide();
-                      $form.find('.form-item[rel=account]').hide();
-                      $form.find('.form-item[rel=username]').hide();
-                      $form.find('.form-item[rel=key]').hide();
+                      $fields.filter('[rel=url]').hide();
+                      $fields.filter('[rel=account]').hide();
+                      $fields.filter('[rel=username]').hide();
+                      $fields.filter('[rel=key]').hide();
                     }
                     else if ($(this).val() == "S3") {
                       //NFS
-                      $form.find('.form-item[rel=zoneid]').hide();
-                      $form.find('.form-item[rel=nfsServer]').hide();
-                      $form.find('.form-item[rel=path]').hide();
+                      $fields.filter('[rel=zoneid]').hide();
+                      $fields.filter('[rel=nfsServer]').hide();
+                      $fields.filter('[rel=path]').hide();
 
                       //S3
-                      $form.find('.form-item[rel=accesskey]').css('display', 'inline-block');
-                      $form.find('.form-item[rel=secretkey]').css('display', 'inline-block');
-                      $form.find('.form-item[rel=bucket]').css('display', 'inline-block');
-                      $form.find('.form-item[rel=endpoint]').css('display', 'inline-block');
-                      $form.find('.form-item[rel=usehttps]').css('display', 'inline-block');
-                      $form.find('.form-item[rel=connectiontimeout]').css('display', 'inline-block');
-                      $form.find('.form-item[rel=maxerrorretry]').css('display', 'inline-block');
-                      $form.find('.form-item[rel=sockettimeout]').css('display', 'inline-block');
+                      $fields.filter('[rel=accesskey]').css('display', 'inline-block');
+                      $fields.filter('[rel=secretkey]').css('display', 'inline-block');
+                      $fields.filter('[rel=bucket]').css('display', 'inline-block');
+                      $fields.filter('[rel=endpoint]').css('display', 'inline-block');
+                      $fields.filter('[rel=usehttps]').css('display', 'inline-block');
+                      $fields.filter('[rel=connectiontimeout]').css('display', 'inline-block');
+                      $fields.filter('[rel=maxerrorretry]').css('display', 'inline-block');
+                      $fields.filter('[rel=sockettimeout]').css('display', 'inline-block');
 
                       //Swift
-                      $form.find('.form-item[rel=url]').hide();
-                      $form.find('.form-item[rel=account]').hide();
-                      $form.find('.form-item[rel=username]').hide();
-                      $form.find('.form-item[rel=key]').hide();
+                      $fields.filter('[rel=url]').hide();
+                      $fields.filter('[rel=account]').hide();
+                      $fields.filter('[rel=username]').hide();
+                      $fields.filter('[rel=key]').hide();
                     }
                     else if($(this).val() == "Swift") {
                       //NFS
-                      $form.find('.form-item[rel=zoneid]').hide();
-                      $form.find('.form-item[rel=nfsServer]').hide();
-                      $form.find('.form-item[rel=path]').hide();
+                      $fields.filter('[rel=zoneid]').hide();
+                      $fields.filter('[rel=nfsServer]').hide();
+                      $fields.filter('[rel=path]').hide();
 
                       //S3
-                      $form.find('.form-item[rel=accesskey]').hide();
-                      $form.find('.form-item[rel=secretkey]').hide();
-                      $form.find('.form-item[rel=bucket]').hide();
-                      $form.find('.form-item[rel=endpoint]').hide();
-                      $form.find('.form-item[rel=usehttps]').hide();
-                      $form.find('.form-item[rel=connectiontimeout]').hide();
-                      $form.find('.form-item[rel=maxerrorretry]').hide();
-                      $form.find('.form-item[rel=sockettimeout]').hide();
+                      $fields.filter('[rel=accesskey]').hide();
+                      $fields.filter('[rel=secretkey]').hide();
+                      $fields.filter('[rel=bucket]').hide();
+                      $fields.filter('[rel=endpoint]').hide();
+                      $fields.filter('[rel=usehttps]').hide();
+                      $fields.filter('[rel=connectiontimeout]').hide();
+                      $fields.filter('[rel=maxerrorretry]').hide();
+                      $fields.filter('[rel=sockettimeout]').hide();
 
                       //Swift
-                      $form.find('.form-item[rel=url]').css('display', 'inline-block');
-                      $form.find('.form-item[rel=account]').css('display', 'inline-block');
-                      $form.find('.form-item[rel=username]').css('display', 'inline-block');
-                      $form.find('.form-item[rel=key]').css('display', 'inline-block');
+                      $fields.filter('[rel=url]').css('display', 'inline-block');
+                      $fields.filter('[rel=account]').css('display', 'inline-block');
+                      $fields.filter('[rel=username]').css('display', 'inline-block');
+                      $fields.filter('[rel=key]').css('display', 'inline-block');
                     }                    
                   });     
                   


Mime
View raw message