From b0d12e898507f2ffa9cb5013d8ed05775597a30a Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Mon, 7 Feb 2011 09:58:36 -0800 Subject: [PATCH] =?UTF-8?q?Add=20Primary=20Storage=20-=20KVM=20hypervisor?= =?UTF-8?q?=20-=20change=20protocol=20name=20from=20"sharedMountPoint?= =?UTF-8?q?=E2=80=9D=20to=20=E2=80=9CSharedMountPoint=E2=80=9D.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/scripts/cloud.core.pod.js | 14 +++++++------- ui/scripts/cloud.core.resource.js | 8 ++++---- ui/scripts/cloud.core.zone.js | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ui/scripts/cloud.core.pod.js b/ui/scripts/cloud.core.pod.js index 697a578c222..bfef96dc0b7 100644 --- a/ui/scripts/cloud.core.pod.js +++ b/ui/scripts/cloud.core.pod.js @@ -665,7 +665,7 @@ function bindAddPrimaryStorageButton($leftmenuItem1) { if(objCluster.hypervisortype == "KVM") { $protocolSelector.empty(); $protocolSelector.append(''); - $protocolSelector.append(''); + $protocolSelector.append(''); } else if(objCluster.hypervisortype == "XenServer") { $protocolSelector.empty(); $protocolSelector.append(''); @@ -696,7 +696,7 @@ function bindAddPrimaryStorageButton($leftmenuItem1) { var isValid = true; isValid &= validateDropDownBox("Cluster", $thisDialog.find("#pool_cluster"), $thisDialog.find("#pool_cluster_errormsg"), false); //required, reset error text isValid &= validateString("Name", $thisDialog.find("#add_pool_name"), $thisDialog.find("#add_pool_name_errormsg")); - if (protocol == "nfs" || protocol == "PreSetup" || protocol == "sharedMountPoint") { + if (protocol == "nfs" || protocol == "PreSetup" || protocol == "SharedMountPoint") { isValid &= validateString("Server", $thisDialog.find("#add_pool_nfs_server"), $thisDialog.find("#add_pool_nfs_server_errormsg")); isValid &= validateString("Path", $thisDialog.find("#add_pool_path"), $thisDialog.find("#add_pool_path_errormsg")); } else if(protocol == "iscsi") { @@ -738,11 +738,11 @@ function bindAddPrimaryStorageButton($leftmenuItem1) { path = "/" + path; url = presetupURL(server, path); } - else if (protocol == "sharedMountPoint") { + else if (protocol == "SharedMountPoint") { var path = trim($thisDialog.find("#add_pool_path").val()); if(path.substring(0,1)!="/") path = "/" + path; - url = sharedMountPointURL(server, path); + url = SharedMountPointURL(server, path); } else if (protocol == "vmfs") { var path = trim($thisDialog.find("#add_pool_vmfs_dc").val()); @@ -892,10 +892,10 @@ function presetupURL(server, path) { return url; } -function sharedMountPointURL(server, path) { +function SharedMountPointURL(server, path) { var url; if(server.indexOf("://")==-1) - url = "sharedMountPoint://" + server + path; + url = "SharedMountPoint://" + server + path; else url = server + path; return url; @@ -942,7 +942,7 @@ function bindEventHandlerToDialogAddPool($dialogAddPool) { $('li[input_group="vmfs"]', $dialogAddPool).show(); $dialogAddPool.find("#add_pool_nfs_server").attr("disabled", false).val(""); } - else if($(this).val() == "sharedMountPoint") { //"sharedMountPoint" show the same fields as "nfs" does. + else if($(this).val() == "SharedMountPoint") { //"SharedMountPoint" show the same fields as "nfs" does. $("#add_pool_server_container", $dialogAddPool).show(); $('li[input_group="nfs"]', $dialogAddPool).show(); $('li[input_group="iscsi"]', $dialogAddPool).hide(); diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js index 098a76078e6..e96810ad914 100644 --- a/ui/scripts/cloud.core.resource.js +++ b/ui/scripts/cloud.core.resource.js @@ -1711,7 +1711,7 @@ function initAddPrimaryStorageShortcut($midmenuAddLink2, currentPageInRightPanel if(objCluster.hypervisortype == "KVM") { $protocolSelector.empty(); $protocolSelector.append(''); - $protocolSelector.append(''); + $protocolSelector.append(''); } else if(objCluster.hypervisortype == "XenServer") { $protocolSelector.empty(); $protocolSelector.append(''); @@ -1744,7 +1744,7 @@ function initAddPrimaryStorageShortcut($midmenuAddLink2, currentPageInRightPanel isValid &= validateDropDownBox("Pod", $thisDialog.find("#pod_dropdown"), $thisDialog.find("#pod_dropdown_errormsg")); isValid &= validateDropDownBox("Cluster", $thisDialog.find("#cluster_select"), $thisDialog.find("#cluster_select_errormsg"), false); //required, reset error text isValid &= validateString("Name", $thisDialog.find("#add_pool_name"), $thisDialog.find("#add_pool_name_errormsg")); - if (protocol == "nfs" || protocol == "PreSetup" || protocol == "sharedMountPoint") { + if (protocol == "nfs" || protocol == "PreSetup" || protocol == "SharedMountPoint") { isValid &= validateString("Server", $thisDialog.find("#add_pool_nfs_server"), $thisDialog.find("#add_pool_nfs_server_errormsg")); isValid &= validateString("Path", $thisDialog.find("#add_pool_path"), $thisDialog.find("#add_pool_path_errormsg")); } else if(protocol == "iscsi") { @@ -1795,11 +1795,11 @@ function initAddPrimaryStorageShortcut($midmenuAddLink2, currentPageInRightPanel path = "/" + path; url = presetupURL(server, path); } - else if (protocol == "sharedMountPoint") { + else if (protocol == "SharedMountPoint") { var path = trim($thisDialog.find("#add_pool_path").val()); if(path.substring(0,1)!="/") path = "/" + path; - url = sharedMountPointURL(server, path); + url = SharedMountPointURL(server, path); } else if(protocol == "vmfs") { var path = trim($thisDialog.find("#add_pool_vmfs_dc").val()); diff --git a/ui/scripts/cloud.core.zone.js b/ui/scripts/cloud.core.zone.js index f04356ff2ca..c1169c29855 100644 --- a/ui/scripts/cloud.core.zone.js +++ b/ui/scripts/cloud.core.zone.js @@ -873,7 +873,7 @@ function bindAddPrimaryStorageButtonOnZonePage($button, zoneId, zoneName) { if(objCluster.hypervisortype == "KVM") { $protocolSelector.empty(); $protocolSelector.append(''); - $protocolSelector.append(''); + $protocolSelector.append(''); } else if(objCluster.hypervisortype == "XenServer") { $protocolSelector.empty(); $protocolSelector.append(''); @@ -905,7 +905,7 @@ function bindAddPrimaryStorageButtonOnZonePage($button, zoneId, zoneName) { isValid &= validateDropDownBox("Pod", $thisDialog.find("#pod_dropdown"), $thisDialog.find("#pod_dropdown_errormsg")); isValid &= validateDropDownBox("Cluster", $thisDialog.find("#cluster_select"), $thisDialog.find("#cluster_select_errormsg"), false); //required, reset error text isValid &= validateString("Name", $thisDialog.find("#add_pool_name"), $thisDialog.find("#add_pool_name_errormsg")); - if (protocol == "nfs" || protocol == "PreSetup" || protocol == "sharedMountPoint") { + if (protocol == "nfs" || protocol == "PreSetup" || protocol == "SharedMountPoint") { isValid &= validateString("Server", $thisDialog.find("#add_pool_nfs_server"), $thisDialog.find("#add_pool_nfs_server_errormsg")); isValid &= validateString("Path", $thisDialog.find("#add_pool_path"), $thisDialog.find("#add_pool_path_errormsg")); } else if(protocol == "iscsi") { @@ -955,11 +955,11 @@ function bindAddPrimaryStorageButtonOnZonePage($button, zoneId, zoneName) { path = "/" + path; url = presetupURL(server, path); } - else if (protocol == "sharedMountPoint") { + else if (protocol == "SharedMountPoint") { var path = trim($thisDialog.find("#add_pool_path").val()); if(path.substring(0,1)!="/") path = "/" + path; - url = sharedMountPointURL(server, path); + url = SharedMountPointURL(server, path); } else if (protocol == "vmfs") { var path = trim($thisDialog.find("#add_pool_vmfs_dc").val());