incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject git commit: ix the add primary storage dialog so that when changing the protocol from RBD to another protocol the RBD fields will be removed.
Date Fri, 14 Dec 2012 07:32:45 GMT
Updated Branches:
  refs/heads/master b70c1a5a8 -> 5df88d42c


ix the add primary storage dialog so that when changing the protocol from RBD to another protocol
the RBD fields will be removed.


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

Branch: refs/heads/master
Commit: 5df88d42c8e62bcf72d9b7ee15f8dedfe69b65c5
Parents: b70c1a5
Author: Edison Su <edison.su@citrix.com>
Authored: Thu Dec 13 23:32:29 2012 -0800
Committer: Edison Su <edison.su@citrix.com>
Committed: Thu Dec 13 23:32:29 2012 -0800

----------------------------------------------------------------------
 ui/scripts/system.js |  104 +++++++++++++++++++++++++++++++--------------
 1 files changed, 72 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5df88d42/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 7c8f360..d018b8a 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -8827,19 +8827,24 @@
                           //$('li[input_group="nfs"]', $dialogAddPool).show();
                           $form.find('.form-item[rel=path]').css('display', 'inline-block');
                           //$dialogAddPool.find("#add_pool_path_container").find("label").text(g_dictionary["label.path"]+":");
-						              var $required = $form.find('.form-item[rel=path]').find(".name").find("label
span");
+                          var $required = $form.find('.form-item[rel=path]').find(".name").find("label
span");
                           $form.find('.form-item[rel=path]').find(".name").find("label").text("Path:").prepend($required);
 
                           //$('li[input_group="iscsi"]', $dialogAddPool).hide();
                           $form.find('.form-item[rel=iqn]').hide();
                           $form.find('.form-item[rel=lun]').hide();
 
-													//$('li[input_group="clvm"]', $dialogAddPool).hide();
-													$form.find('.form-item[rel=volumegroup]').hide();
+                          //$('li[input_group="clvm"]', $dialogAddPool).hide();
+                          $form.find('.form-item[rel=volumegroup]').hide();
 
                           //$('li[input_group="vmfs"]', $dialogAddPool).hide();
                           $form.find('.form-item[rel=vCenterDataCenter]').hide();
                           $form.find('.form-item[rel=vCenterDataStore]').hide();
+
+                          $form.find('.form-item[rel=rbdmonitor]').hide();
+                          $form.find('.form-item[rel=rbdpool]').hide();
+                          $form.find('.form-item[rel=rbdid]').hide();
+                          $form.find('.form-item[rel=rbdsecret]').hide();
                         }
                         else if(protocol == "ocfs2") {//ocfs2 is the same as nfs, except
no server field.
                           //$dialogAddPool.find("#add_pool_server_container").hide();
@@ -8850,19 +8855,24 @@
                           //$('li[input_group="nfs"]', $dialogAddPool).show();
                           $form.find('.form-item[rel=path]').css('display', 'inline-block');
                           //$dialogAddPool.find("#add_pool_path_container").find("label").text(g_dictionary["label.path"]+":");
-						              var $required = $form.find('.form-item[rel=path]').find(".name").find("label
span");
+                          var $required = $form.find('.form-item[rel=path]').find(".name").find("label
span");
                           $form.find('.form-item[rel=path]').find(".name").find("label").text("Path:").prepend($required);
 
                           //$('li[input_group="iscsi"]', $dialogAddPool).hide();
                           $form.find('.form-item[rel=iqn]').hide();
                           $form.find('.form-item[rel=lun]').hide();
 
-													//$('li[input_group="clvm"]', $dialogAddPool).hide();
-													$form.find('.form-item[rel=volumegroup]').hide();
+                          //$('li[input_group="clvm"]', $dialogAddPool).hide();
+                          $form.find('.form-item[rel=volumegroup]').hide();
 
                           //$('li[input_group="vmfs"]', $dialogAddPool).hide();
                           $form.find('.form-item[rel=vCenterDataCenter]').hide();
                           $form.find('.form-item[rel=vCenterDataStore]').hide();
+
+                          $form.find('.form-item[rel=rbdmonitor]').hide();
+                          $form.find('.form-item[rel=rbdpool]').hide();
+                          $form.find('.form-item[rel=rbdid]').hide();
+                          $form.find('.form-item[rel=rbdsecret]').hide();
                         }
                         else if(protocol == "PreSetup") {
                           //$dialogAddPool.find("#add_pool_server_container").hide();
@@ -8873,19 +8883,24 @@
                           //$('li[input_group="nfs"]', $dialogAddPool).show();
                           $form.find('.form-item[rel=path]').css('display', 'inline-block');
                           //$dialogAddPool.find("#add_pool_path_container").find("label").text(g_dictionary["label.SR.name"]+":");
                         
-						              var $required = $form.find('.form-item[rel=path]').find(".name").find("label
span");
+                          var $required = $form.find('.form-item[rel=path]').find(".name").find("label
span");
                           $form.find('.form-item[rel=path]').find(".name").find("label").text("SR
Name-Label:").prepend($required);
 
                           //$('li[input_group="iscsi"]', $dialogAddPool).hide();
                           $form.find('.form-item[rel=iqn]').hide();
                           $form.find('.form-item[rel=lun]').hide();
 
-													//$('li[input_group="clvm"]', $dialogAddPool).hide();
-													$form.find('.form-item[rel=volumegroup]').hide();
+                          //$('li[input_group="clvm"]', $dialogAddPool).hide();
+                          $form.find('.form-item[rel=volumegroup]').hide();
 
                           //$('li[input_group="vmfs"]', $dialogAddPool).hide();
                           $form.find('.form-item[rel=vCenterDataCenter]').hide();
                           $form.find('.form-item[rel=vCenterDataStore]').hide();
+
+                          $form.find('.form-item[rel=rbdmonitor]').hide();
+                          $form.find('.form-item[rel=rbdpool]').hide();
+                          $form.find('.form-item[rel=rbdid]').hide();
+                          $form.find('.form-item[rel=rbdsecret]').hide();
                         }
                         else if(protocol == "iscsi") {
                           //$dialogAddPool.find("#add_pool_server_container").show();
@@ -8900,33 +8915,43 @@
                           $form.find('.form-item[rel=iqn]').css('display', 'inline-block');
                           $form.find('.form-item[rel=lun]').css('display', 'inline-block');
 
-													//$('li[input_group="clvm"]', $dialogAddPool).hide();
-													$form.find('.form-item[rel=volumegroup]').hide();
+                          //$('li[input_group="clvm"]', $dialogAddPool).hide();
+                          $form.find('.form-item[rel=volumegroup]').hide();
 
                           //$('li[input_group="vmfs"]', $dialogAddPool).hide();
                           $form.find('.form-item[rel=vCenterDataCenter]').hide();
                           $form.find('.form-item[rel=vCenterDataStore]').hide();
+
+                          $form.find('.form-item[rel=rbdmonitor]').hide();
+                          $form.find('.form-item[rel=rbdpool]').hide();
+                          $form.find('.form-item[rel=rbdid]').hide();
+                          $form.find('.form-item[rel=rbdsecret]').hide();
                         }
-												else if($(this).val() == "clvm") {
-													//$("#add_pool_server_container", $dialogAddPool).hide();
-													$form.find('.form-item[rel=server]').hide();
-													//$dialogAddPool.find("#add_pool_nfs_server").val("localhost");
-													$form.find('.form-item[rel=server]').find(".value").find("input").val("localhost");
+                        else if($(this).val() == "clvm") {
+                          //$("#add_pool_server_container", $dialogAddPool).hide();
+                          $form.find('.form-item[rel=server]').hide();
+                          //$dialogAddPool.find("#add_pool_nfs_server").val("localhost");
+                          $form.find('.form-item[rel=server]').find(".value").find("input").val("localhost");
 
-													//$('li[input_group="nfs"]', $dialogAddPool).hide();
-													$form.find('.form-item[rel=path]').hide();
+                          //$('li[input_group="nfs"]', $dialogAddPool).hide();
+                          $form.find('.form-item[rel=path]').hide();
 
-													//$('li[input_group="iscsi"]', $dialogAddPool).hide();
-													 $form.find('.form-item[rel=iqn]').hide();
+                          //$('li[input_group="iscsi"]', $dialogAddPool).hide();
+                          $form.find('.form-item[rel=iqn]').hide();
                           $form.find('.form-item[rel=lun]').hide();
 
-													//$('li[input_group="clvm"]', $dialogAddPool).show();
-													$form.find('.form-item[rel=volumegroup]').css('display', 'inline-block');
+                          //$('li[input_group="clvm"]', $dialogAddPool).show();
+                          $form.find('.form-item[rel=volumegroup]').css('display', 'inline-block');
 
-													//$('li[input_group="vmfs"]', $dialogAddPool).hide();
-													$form.find('.form-item[rel=vCenterDataCenter]').hide();
+                          //$('li[input_group="vmfs"]', $dialogAddPool).hide();
+                          $form.find('.form-item[rel=vCenterDataCenter]').hide();
                           $form.find('.form-item[rel=vCenterDataStore]').hide();
-												}
+
+                          $form.find('.form-item[rel=rbdmonitor]').hide();
+                          $form.find('.form-item[rel=rbdpool]').hide();
+                          $form.find('.form-item[rel=rbdid]').hide();
+                          $form.find('.form-item[rel=rbdsecret]').hide();
+                        }
                         else if(protocol == "vmfs") {
                           //$dialogAddPool.find("#add_pool_server_container").show();
                           $form.find('.form-item[rel=server]').css('display', 'inline-block');
@@ -8940,12 +8965,17 @@
                           $form.find('.form-item[rel=iqn]').hide();
                           $form.find('.form-item[rel=lun]').hide();
 
-													//$('li[input_group="clvm"]', $dialogAddPool).hide();
-													$form.find('.form-item[rel=volumegroup]').hide();
+                          //$('li[input_group="clvm"]', $dialogAddPool).hide();
+                          $form.find('.form-item[rel=volumegroup]').hide();
 
                           //$('li[input_group="vmfs"]', $dialogAddPool).show();
                           $form.find('.form-item[rel=vCenterDataCenter]').css('display',
'inline-block');
                           $form.find('.form-item[rel=vCenterDataStore]').css('display', 'inline-block');
+
+                          $form.find('.form-item[rel=rbdmonitor]').hide();
+                          $form.find('.form-item[rel=rbdpool]').hide();
+                          $form.find('.form-item[rel=rbdid]').hide();
+                          $form.find('.form-item[rel=rbdsecret]').hide();
                         }
                         else if(protocol == "SharedMountPoint") {  //"SharedMountPoint" show
the same fields as "nfs" does.
                           //$dialogAddPool.find("#add_pool_server_container").hide();
@@ -8955,19 +8985,24 @@
 
                           //$('li[input_group="nfs"]', $dialogAddPool).show();
                           $form.find('.form-item[rel=path]').css('display', 'inline-block');
-						              var $required = $form.find('.form-item[rel=path]').find(".name").find("label
span");
+                          var $required = $form.find('.form-item[rel=path]').find(".name").find("label
span");
                           $form.find('.form-item[rel=path]').find(".name").find("label").text("Path:").prepend($required);
 
                           //$('li[input_group="iscsi"]', $dialogAddPool).hide();
                           $form.find('.form-item[rel=iqn]').hide();
                           $form.find('.form-item[rel=lun]').hide();
 
-													//$('li[input_group="clvm"]', $dialogAddPool).hide();
-													$form.find('.form-item[rel=volumegroup]').hide();
+                          //$('li[input_group="clvm"]', $dialogAddPool).hide();
+                          $form.find('.form-item[rel=volumegroup]').hide();
 
                           //$('li[input_group="vmfs"]', $dialogAddPool).hide();
                           $form.find('.form-item[rel=vCenterDataCenter]').hide();
                           $form.find('.form-item[rel=vCenterDataStore]').hide();
+
+                          $form.find('.form-item[rel=rbdmonitor]').hide();
+                          $form.find('.form-item[rel=rbdpool]').hide();
+                          $form.find('.form-item[rel=rbdid]').hide();
+                          $form.find('.form-item[rel=rbdsecret]').hide();
                         }
                         else if(protocol == "rbd") {
                           $form.find('.form-item[rel=rbdmonitor]').css('display', 'inline-block');
@@ -9000,12 +9035,17 @@
                           $form.find('.form-item[rel=iqn]').hide();
                           $form.find('.form-item[rel=lun]').hide();
 
-													//$('li[input_group="clvm"]', $dialogAddPool).hide();
-													$form.find('.form-item[rel=volumegroup]').hide();
+                          //$('li[input_group="clvm"]', $dialogAddPool).hide();
+                          $form.find('.form-item[rel=volumegroup]').hide();
 
                           //$('li[input_group="vmfs"]', $dialogAddPool).hide();
                           $form.find('.form-item[rel=vCenterDataCenter]').hide();
                           $form.find('.form-item[rel=vCenterDataStore]').hide();
+
+                          $form.find('.form-item[rel=rbdmonitor]').hide();
+                          $form.find('.form-item[rel=rbdpool]').hide();
+                          $form.find('.form-item[rel=rbdid]').hide();
+                          $form.find('.form-item[rel=rbdsecret]').hide();
                         }
                       });
 


Mime
View raw message