apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add Primary Storage dialog - When protocol is PreSetup, compose URL as "presetup://~~~~~~~".

Browse Source
This commit is contained in:
Jessica Wang 2011-02-04 15:01:43 -08:00
parent 41a1e2cd9e
commit ec6aa13c74
3 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ui/scripts/cloud.core.pod.js
View File

@ -726,12 +726,18 @@ function bindAddPrimaryStorageButton($leftmenuItem1) {
var server = trim($thisDialog.find("#add_pool_nfs_server").val()); var server = trim($thisDialog.find("#add_pool_nfs_server").val());
var url = null; var url = null;
if (protocol == "nfs" || protocol == "PreSetup") { if (protocol == "nfs") {
var path = trim($thisDialog.find("#add_pool_path").val()); var path = trim($thisDialog.find("#add_pool_path").val());
if(path.substring(0,1)!="/") if(path.substring(0,1)!="/")
path = "/" + path; path = "/" + path;
url = nfsURL(server, path); url = nfsURL(server, path);
} }
else if (protocol == "PreSetup") {
var path = trim($thisDialog.find("#add_pool_path").val());
if(path.substring(0,1)!="/")
path = "/" + path;
url = presetupURL(server, path);
}
else if (protocol == "sharedMountPoint") { else if (protocol == "sharedMountPoint") {
var path = trim($thisDialog.find("#add_pool_path").val()); var path = trim($thisDialog.find("#add_pool_path").val());
if(path.substring(0,1)!="/") if(path.substring(0,1)!="/")
@ -877,6 +883,15 @@ function nfsURL(server, path) {
return url; return url;
} }
function presetupURL(server, path) {
var url;
if(server.indexOf("://")==-1)
url = "presetup://" + server + path;
else
url = server + path;
return url;
}
function sharedMountPointURL(server, path) { function sharedMountPointURL(server, path) {
var url; var url;
if(server.indexOf("://")==-1) if(server.indexOf("://")==-1)

8
ui/scripts/cloud.core.resource.js
View File

@ -1783,12 +1783,18 @@ function initAddPrimaryStorageShortcut($midmenuAddLink2, currentPageInRightPanel
var server = trim($thisDialog.find("#add_pool_nfs_server").val()); var server = trim($thisDialog.find("#add_pool_nfs_server").val());
var url = null; var url = null;
if (protocol == "nfs" || protocol == "PreSetup") { if (protocol == "nfs") {
var path = trim($thisDialog.find("#add_pool_path").val()); var path = trim($thisDialog.find("#add_pool_path").val());
if(path.substring(0,1)!="/") if(path.substring(0,1)!="/")
path = "/" + path; path = "/" + path;
url = nfsURL(server, path); url = nfsURL(server, path);
} }
else if (protocol == "PreSetup") {
var path = trim($thisDialog.find("#add_pool_path").val());
if(path.substring(0,1)!="/")
path = "/" + path;
url = presetupURL(server, path);
}
else if (protocol == "sharedMountPoint") { else if (protocol == "sharedMountPoint") {
var path = trim($thisDialog.find("#add_pool_path").val()); var path = trim($thisDialog.find("#add_pool_path").val());
if(path.substring(0,1)!="/") if(path.substring(0,1)!="/")

8
ui/scripts/cloud.core.zone.js
View File

@ -943,12 +943,18 @@ function bindAddPrimaryStorageButtonOnZonePage($button, zoneId, zoneName) {
var server = trim($thisDialog.find("#add_pool_nfs_server").val()); var server = trim($thisDialog.find("#add_pool_nfs_server").val());
var url = null; var url = null;
if (protocol == "nfs" || protocol == "PreSetup") { if (protocol == "nfs") {
var path = trim($thisDialog.find("#add_pool_path").val()); var path = trim($thisDialog.find("#add_pool_path").val());
if(path.substring(0,1)!="/") if(path.substring(0,1)!="/")
path = "/" + path; path = "/" + path;
url = nfsURL(server, path); url = nfsURL(server, path);
} }
else if (protocol == "PreSetup") {
var path = trim($thisDialog.find("#add_pool_path").val());
if(path.substring(0,1)!="/")
path = "/" + path;
url = presetupURL(server, path);
}
else if (protocol == "sharedMountPoint") { else if (protocol == "sharedMountPoint") {
var path = trim($thisDialog.find("#add_pool_path").val()); var path = trim($thisDialog.find("#add_pool_path").val());
if(path.substring(0,1)!="/") if(path.substring(0,1)!="/")