From f6dba096774d21e6c3224a6369f66d12266a6985 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 3 Feb 2012 14:38:31 -0800 Subject: [PATCH] bug 12649: cloudstack 2.2.Y UI - domain fields on all dialog boxes - show full domain path instead of domain name. (reviewed-by: Brian) --- ui/scripts/cloud.core.account.js | 6 +++--- ui/scripts/cloud.core.diskoffering.js | 12 ++++++------ ui/scripts/cloud.core.event.js | 6 +++--- ui/scripts/cloud.core.instance.js | 6 +++--- ui/scripts/cloud.core.ipaddress.js | 6 +++--- ui/scripts/cloud.core.iso.js | 6 +++--- ui/scripts/cloud.core.js | 6 +++--- ui/scripts/cloud.core.network.js | 18 +++++++++--------- ui/scripts/cloud.core.resource.js | 12 ++++++------ ui/scripts/cloud.core.router.js | 6 +++--- ui/scripts/cloud.core.securitygroup.js | 6 +++--- ui/scripts/cloud.core.serviceoffering.js | 12 ++++++------ ui/scripts/cloud.core.snapshot.js | 6 +++--- ui/scripts/cloud.core.systemserviceoffering.js | 12 ++++++------ ui/scripts/cloud.core.template.js | 6 +++--- ui/scripts/cloud.core.volume.js | 6 +++--- 16 files changed, 66 insertions(+), 66 deletions(-) diff --git a/ui/scripts/cloud.core.account.js b/ui/scripts/cloud.core.account.js index 635a225e639..87676b90d16 100644 --- a/ui/scripts/cloud.core.account.js +++ b/ui/scripts/cloud.core.account.js @@ -152,12 +152,12 @@ function bindAddAccountButton() { isValid &= validateString("Account", $thisDialog.find("#add_user_account"), $thisDialog.find("#add_user_account_errormsg"), true); //optional isValid &= validateString("Domain", $thisDialog.find("#domain"), $thisDialog.find("#domain_errormsg"), false); //required - var domainName = $thisDialog.find("#domain").val(); + var domainPath = $thisDialog.find("#domain").val(); var domainId; - if(domainName != null && domainName.length > 0) { + if(domainPath != null && domainPath.length > 0) { if(autoCompleteDomains != null && autoCompleteDomains.length > 0) { for(var i=0; i < autoCompleteDomains.length; i++) { - if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) { + if(fromdb(autoCompleteDomains[i].path).toLowerCase() == domainPath.toLowerCase()) { domainId = autoCompleteDomains[i].id; break; } diff --git a/ui/scripts/cloud.core.diskoffering.js b/ui/scripts/cloud.core.diskoffering.js index f32b3eb654d..ee63aa0e67b 100644 --- a/ui/scripts/cloud.core.diskoffering.js +++ b/ui/scripts/cloud.core.diskoffering.js @@ -28,12 +28,12 @@ function diskOfferingGetSearchParams() { if ($advancedSearchPopup.length > 0 && $advancedSearchPopup.css("display") != "none" ) { if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none" && $advancedSearchPopup.find("#domain").hasClass("textwatermark") == false) { - var domainName = $advancedSearchPopup.find("#domain").val(); - if (domainName != null && domainName.length > 0) { + var domainPath = $advancedSearchPopup.find("#domain").val(); + if (domainPath != null && domainPath.length > 0) { var domainId; if(autoCompleteDomains != null && autoCompleteDomains.length > 0) { for(var i=0; i < autoCompleteDomains.length; i++) { - if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) { + if(fromdb(autoCompleteDomains[i].path).toLowerCase() == domainPath.toLowerCase()) { domainId = autoCompleteDomains[i].id; break; } @@ -109,12 +109,12 @@ function initAddDiskOfferingDialog() { if($thisDialog.find("#domain_container").css("display") != "none") { isValid &= validateString("Domain", $thisDialog.find("#domain"), $thisDialog.find("#domain_errormsg"), false); //required - var domainName = $thisDialog.find("#domain").val(); + var domainPath = $thisDialog.find("#domain").val(); var domainId; - if(domainName != null && domainName.length > 0) { + if(domainPath != null && domainPath.length > 0) { if(autoCompleteDomains != null && autoCompleteDomains.length > 0) { for(var i=0; i < autoCompleteDomains.length; i++) { - if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) { + if(fromdb(autoCompleteDomains[i].path).toLowerCase() == domainPath.toLowerCase()) { domainId = autoCompleteDomains[i].id; break; } diff --git a/ui/scripts/cloud.core.event.js b/ui/scripts/cloud.core.event.js index b177a91a519..b75894f0041 100644 --- a/ui/scripts/cloud.core.event.js +++ b/ui/scripts/cloud.core.event.js @@ -36,12 +36,12 @@ function eventGetSearchParams() { if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none" && $advancedSearchPopup.find("#domain").hasClass("textwatermark") == false) { - var domainName = $advancedSearchPopup.find("#domain").val(); - if (domainName != null && domainName.length > 0) { + var domainPath = $advancedSearchPopup.find("#domain").val(); + if (domainPath != null && domainPath.length > 0) { var domainId; if(autoCompleteDomains != null && autoCompleteDomains.length > 0) { for(var i=0; i < autoCompleteDomains.length; i++) { - if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) { + if(fromdb(autoCompleteDomains[i].path).toLowerCase() == domainPath.toLowerCase()) { domainId = autoCompleteDomains[i].id; break; } diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js index c04b0b554e4..4714f2183ad 100755 --- a/ui/scripts/cloud.core.instance.js +++ b/ui/scripts/cloud.core.instance.js @@ -38,12 +38,12 @@ function vmGetSearchParams() { if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none" && $advancedSearchPopup.find("#domain").hasClass("textwatermark") == false) { - var domainName = $advancedSearchPopup.find("#domain").val(); - if (domainName != null && domainName.length > 0) { + var domainPath = $advancedSearchPopup.find("#domain").val(); + if (domainPath != null && domainPath.length > 0) { var domainId; if(autoCompleteDomains != null && autoCompleteDomains.length > 0) { for(var i=0; i < autoCompleteDomains.length; i++) { - if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) { + if(fromdb(autoCompleteDomains[i].path).toLowerCase() == domainPath.toLowerCase()) { domainId = autoCompleteDomains[i].id; break; } diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js index 9e886f9aae4..56f99e9fe88 100644 --- a/ui/scripts/cloud.core.ipaddress.js +++ b/ui/scripts/cloud.core.ipaddress.js @@ -33,12 +33,12 @@ function ipGetSearchParams() { if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none" && $advancedSearchPopup.find("#domain").hasClass("textwatermark") == false) { - var domainName = $advancedSearchPopup.find("#domain").val(); - if (domainName != null && domainName.length > 0) { + var domainPath = $advancedSearchPopup.find("#domain").val(); + if (domainPath != null && domainPath.length > 0) { var domainId; if(autoCompleteDomains != null && autoCompleteDomains.length > 0) { for(var i=0; i < autoCompleteDomains.length; i++) { - if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) { + if(fromdb(autoCompleteDomains[i].path).toLowerCase() == domainPath.toLowerCase()) { domainId = autoCompleteDomains[i].id; break; } diff --git a/ui/scripts/cloud.core.iso.js b/ui/scripts/cloud.core.iso.js index b53906add9e..c3b9d6597c7 100644 --- a/ui/scripts/cloud.core.iso.js +++ b/ui/scripts/cloud.core.iso.js @@ -37,12 +37,12 @@ function isoGetSearchParams() { if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none" && $advancedSearchPopup.find("#domain").hasClass("textwatermark") == false) { - var domainName = $advancedSearchPopup.find("#domain").val(); - if (domainName != null && domainName.length > 0) { + var domainPath = $advancedSearchPopup.find("#domain").val(); + if (domainPath != null && domainPath.length > 0) { var domainId; if(autoCompleteDomains != null && autoCompleteDomains.length > 0) { for(var i=0; i < autoCompleteDomains.length; i++) { - if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) { + if(fromdb(autoCompleteDomains[i].path).toLowerCase() == domainPath.toLowerCase()) { domainId = autoCompleteDomains[i].id; break; } diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js index bc2ad77ab15..f3716240a51 100644 --- a/ui/scripts/cloud.core.js +++ b/ui/scripts/cloud.core.js @@ -1149,7 +1149,7 @@ function applyAutoCompleteToDomainField($field) { var array1 = []; if(autoCompleteDomains != null && autoCompleteDomains.length > 0) { for(var i=0; i < autoCompleteDomains.length; i++) - array1.push(fromdb(autoCompleteDomains[i].name)); + array1.push(fromdb(autoCompleteDomains[i].path)); } response(array1); } @@ -1170,7 +1170,7 @@ function applyAutoCompleteToDomainChildrenField($field, parentDomainId) { autoCompleteDomains = json.listdomainchildrenresponse.domain; if(autoCompleteDomains != null && autoCompleteDomains.length > 0) { for(var i=0; i < autoCompleteDomains.length; i++) - array1.push(fromdb(autoCompleteDomains[i].name)); + array1.push(fromdb(autoCompleteDomains[i].path)); } } }); @@ -1182,7 +1182,7 @@ function applyAutoCompleteToDomainChildrenField($field, parentDomainId) { var items = json.listdomainsresponse.domain; if(items != null && items.length > 0) { autoCompleteDomains.push(items[0]); - array1.push(fromdb(items[0].name)); + array1.push(fromdb(items[0].path)); } } }); diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js index 24565114447..1ab95e20905 100644 --- a/ui/scripts/cloud.core.network.js +++ b/ui/scripts/cloud.core.network.js @@ -28,12 +28,12 @@ function networkGetSearchParams() { if ($advancedSearchPopup.length > 0 && $advancedSearchPopup.css("display") != "none" ) { if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none" && $advancedSearchPopup.find("#domain").hasClass("textwatermark") == false) { - var domainName = $advancedSearchPopup.find("#domain").val(); - if (domainName != null && domainName.length > 0) { + var domainPath = $advancedSearchPopup.find("#domain").val(); + if (domainPath != null && domainPath.length > 0) { var domainId; if(autoCompleteDomains != null && autoCompleteDomains.length > 0) { for(var i=0; i < autoCompleteDomains.length; i++) { - if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) { + if(fromdb(autoCompleteDomains[i].path).toLowerCase() == domainPath.toLowerCase()) { domainId = autoCompleteDomains[i].id; break; } @@ -620,9 +620,9 @@ function bindAddIpRangeToPublicNetworkButton() { if($thisDialog.find("#domain_container").css("display") != "none") { isValid &= validateString("Domain", $thisDialog.find("#domain"), $thisDialog.find("#domain_errormsg"), false); //required - var domainName = $thisDialog.find("#domain").val(); + var domainPath = $thisDialog.find("#domain").val(); var domainId; - if(domainName != null && domainName.length > 0) { + if(domainPath != null && domainPath.length > 0) { var items; if(zoneObj.domainid != null) items = autoCompleteDomains; @@ -631,7 +631,7 @@ function bindAddIpRangeToPublicNetworkButton() { if(items != null && items.length > 0) { for(var i=0; i < items.length; i++) { - if(fromdb(items[i].name).toLowerCase() == domainName.toLowerCase()) { + if(fromdb(items[i].path).toLowerCase() == domainPath.toLowerCase()) { domainId = items[i].id; break; } @@ -1307,9 +1307,9 @@ function bindAddNetworkButton() { if($thisDialog.find("#domain_container").css("display") != "none") { isValid &= validateString("Domain", $thisDialog.find("#domain"), $thisDialog.find("#domain_errormsg"), false); //required - var domainName = $thisDialog.find("#domain").val(); + var domainPath = $thisDialog.find("#domain").val(); var domainId; - if(domainName != null && domainName.length > 0) { + if(domainPath != null && domainPath.length > 0) { var items; if(zoneObj.domainid != null) items = autoCompleteDomains; @@ -1318,7 +1318,7 @@ function bindAddNetworkButton() { if(items != null && items.length > 0) { for(var i=0; i < items.length; i++) { - if(fromdb(items[i].name).toLowerCase() == domainName.toLowerCase()) { + if(fromdb(items[i].path).toLowerCase() == domainPath.toLowerCase()) { domainId = items[i].id; break; } diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js index af14e15840c..bf6ea18819c 100644 --- a/ui/scripts/cloud.core.resource.js +++ b/ui/scripts/cloud.core.resource.js @@ -1317,12 +1317,12 @@ function addZoneWizardValidateZond($thisWizard) { } if($thisStep.find("#domain_container").css("display") != "none") { isValid &= validateString("Domain", $thisStep.find("#domain"), $thisStep.find("#domain_errormsg"), false); //required - var domainName = $thisStep.find("#domain").val(); + var domainPath = $thisStep.find("#domain").val(); var domainId; - if(domainName != null && domainName.length > 0) { + if(domainPath != null && domainPath.length > 0) { if(autoCompleteDomains != null && autoCompleteDomains.length > 0) { for(var i=0; i < autoCompleteDomains.length; i++) { - if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) { + if(fromdb(autoCompleteDomains[i].path).toLowerCase() == domainPath.toLowerCase()) { domainId = autoCompleteDomains[i].id; $thisStep.find("#domain").data("domainId", domainId); break; @@ -1381,12 +1381,12 @@ function addZoneWizardValidateVirtualVLAN($thisWizard) { if($createVirtualVlan.find("#vlan_domain_container").css("display") != "none") { isValid &= validateString("Domain", $createVirtualVlan.find("#vlan_domain"), $createVirtualVlan.find("#vlan_domain_errormsg"), false); //required - var domainName = $createVirtualVlan.find("#vlan_domain").val(); + var domainPath = $createVirtualVlan.find("#vlan_domain").val(); var domainId; - if(domainName != null && domainName.length > 0) { + if(domainPath != null && domainPath.length > 0) { if(autoCompleteDomains != null && autoCompleteDomains.length > 0) { for(var i=0; i < autoCompleteDomains.length; i++) { - if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) { + if(fromdb(autoCompleteDomains[i].path).toLowerCase() == domainPath.toLowerCase()) { domainId = autoCompleteDomains[i].id; $createVirtualVlan.find("#vlan_domain").data("domainId", domainId); break; diff --git a/ui/scripts/cloud.core.router.js b/ui/scripts/cloud.core.router.js index b5850e3f8a2..60d95118216 100644 --- a/ui/scripts/cloud.core.router.js +++ b/ui/scripts/cloud.core.router.js @@ -42,12 +42,12 @@ function routerGetSearchParams() { if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none" && $advancedSearchPopup.find("#domain").hasClass("textwatermark") == false) { - var domainName = $advancedSearchPopup.find("#domain").val(); - if (domainName != null && domainName.length > 0) { + var domainPath = $advancedSearchPopup.find("#domain").val(); + if (domainPath != null && domainPath.length > 0) { var domainId; if(autoCompleteDomains != null && autoCompleteDomains.length > 0) { for(var i=0; i < autoCompleteDomains.length; i++) { - if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) { + if(fromdb(autoCompleteDomains[i].path).toLowerCase() == domainPath.toLowerCase()) { domainId = autoCompleteDomains[i].id; break; } diff --git a/ui/scripts/cloud.core.securitygroup.js b/ui/scripts/cloud.core.securitygroup.js index 2b96293db14..992801b3850 100644 --- a/ui/scripts/cloud.core.securitygroup.js +++ b/ui/scripts/cloud.core.securitygroup.js @@ -28,12 +28,12 @@ function securityGroupGetSearchParams() { if ($advancedSearchPopup.length > 0 && $advancedSearchPopup.css("display") != "none" ) { if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none" && $advancedSearchPopup.find("#domain").hasClass("textwatermark") == false) { - var domainName = $advancedSearchPopup.find("#domain").val(); - if (domainName != null && domainName.length > 0) { + var domainPath = $advancedSearchPopup.find("#domain").val(); + if (domainPath != null && domainPath.length > 0) { var domainId; if(autoCompleteDomains != null && autoCompleteDomains.length > 0) { for(var i=0; i < autoCompleteDomains.length; i++) { - if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) { + if(fromdb(autoCompleteDomains[i].path).toLowerCase() == domainPath.toLowerCase()) { domainId = autoCompleteDomains[i].id; break; } diff --git a/ui/scripts/cloud.core.serviceoffering.js b/ui/scripts/cloud.core.serviceoffering.js index 727be2b9138..2d4924b3861 100644 --- a/ui/scripts/cloud.core.serviceoffering.js +++ b/ui/scripts/cloud.core.serviceoffering.js @@ -28,12 +28,12 @@ function serviceOfferingGetSearchParams() { if ($advancedSearchPopup.length > 0 && $advancedSearchPopup.css("display") != "none" ) { if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none" && $advancedSearchPopup.find("#domain").hasClass("textwatermark") == false) { - var domainName = $advancedSearchPopup.find("#domain").val(); - if (domainName != null && domainName.length > 0) { + var domainPath = $advancedSearchPopup.find("#domain").val(); + if (domainPath != null && domainPath.length > 0) { var domainId; if(autoCompleteDomains != null && autoCompleteDomains.length > 0) { for(var i=0; i < autoCompleteDomains.length; i++) { - if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) { + if(fromdb(autoCompleteDomains[i].path).toLowerCase() == domainPath.toLowerCase()) { domainId = autoCompleteDomains[i].id; break; } @@ -102,12 +102,12 @@ function initAddServiceOfferingDialog() { if($thisDialog.find("#domain_container").css("display") != "none") { isValid &= validateString("Domain", $thisDialog.find("#domain"), $thisDialog.find("#domain_errormsg"), false); //required - var domainName = $thisDialog.find("#domain").val(); + var domainPath = $thisDialog.find("#domain").val(); var domainId; - if(domainName != null && domainName.length > 0) { + if(domainPath != null && domainPath.length > 0) { if(autoCompleteDomains != null && autoCompleteDomains.length > 0) { for(var i=0; i < autoCompleteDomains.length; i++) { - if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) { + if(fromdb(autoCompleteDomains[i].path).toLowerCase() == domainPath.toLowerCase()) { domainId = autoCompleteDomains[i].id; break; } diff --git a/ui/scripts/cloud.core.snapshot.js b/ui/scripts/cloud.core.snapshot.js index b324e938f4c..7ed1d9b8652 100644 --- a/ui/scripts/cloud.core.snapshot.js +++ b/ui/scripts/cloud.core.snapshot.js @@ -28,12 +28,12 @@ function snapshotGetSearchParams() { if ($advancedSearchPopup.length > 0 && $advancedSearchPopup.css("display") != "none" ) { if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none" && $advancedSearchPopup.find("#domain").hasClass("textwatermark") == false) { - var domainName = $advancedSearchPopup.find("#domain").val(); - if (domainName != null && domainName.length > 0) { + var domainPath = $advancedSearchPopup.find("#domain").val(); + if (domainPath != null && domainPath.length > 0) { var domainId; if(autoCompleteDomains != null && autoCompleteDomains.length > 0) { for(var i=0; i < autoCompleteDomains.length; i++) { - if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) { + if(fromdb(autoCompleteDomains[i].path).toLowerCase() == domainPath.toLowerCase()) { domainId = autoCompleteDomains[i].id; break; } diff --git a/ui/scripts/cloud.core.systemserviceoffering.js b/ui/scripts/cloud.core.systemserviceoffering.js index cb217c4907b..9df7de576b7 100644 --- a/ui/scripts/cloud.core.systemserviceoffering.js +++ b/ui/scripts/cloud.core.systemserviceoffering.js @@ -28,12 +28,12 @@ function systemServiceOfferingGetSearchParams() { if ($advancedSearchPopup.length > 0 && $advancedSearchPopup.css("display") != "none" ) { if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none" && $advancedSearchPopup.find("#domain").hasClass("textwatermark") == false) { - var domainName = $advancedSearchPopup.find("#domain").val(); - if (domainName != null && domainName.length > 0) { + var domainPath = $advancedSearchPopup.find("#domain").val(); + if (domainPath != null && domainPath.length > 0) { var domainId; if(autoCompleteDomains != null && autoCompleteDomains.length > 0) { for(var i=0; i < autoCompleteDomains.length; i++) { - if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) { + if(fromdb(autoCompleteDomains[i].path).toLowerCase() == domainPath.toLowerCase()) { domainId = autoCompleteDomains[i].id; break; } @@ -102,12 +102,12 @@ function initAddSystemServiceOfferingDialog() { if($thisDialog.find("#domain_container").css("display") != "none") { isValid &= validateString("Domain", $thisDialog.find("#domain"), $thisDialog.find("#domain_errormsg"), false); //required - var domainName = $thisDialog.find("#domain").val(); + var domainPath = $thisDialog.find("#domain").val(); var domainId; - if(domainName != null && domainName.length > 0) { + if(domainPath != null && domainPath.length > 0) { if(autoCompleteDomains != null && autoCompleteDomains.length > 0) { for(var i=0; i < autoCompleteDomains.length; i++) { - if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) { + if(fromdb(autoCompleteDomains[i].path).toLowerCase() == domainPath.toLowerCase()) { domainId = autoCompleteDomains[i].id; break; } diff --git a/ui/scripts/cloud.core.template.js b/ui/scripts/cloud.core.template.js index f6fa1069539..a4f09a02522 100644 --- a/ui/scripts/cloud.core.template.js +++ b/ui/scripts/cloud.core.template.js @@ -37,12 +37,12 @@ function templateGetSearchParams() { if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none" && $advancedSearchPopup.find("#domain").hasClass("textwatermark") == false) { - var domainName = $advancedSearchPopup.find("#domain").val(); - if (domainName != null && domainName.length > 0) { + var domainPath = $advancedSearchPopup.find("#domain").val(); + if (domainPath != null && domainPath.length > 0) { var domainId; if(autoCompleteDomains != null && autoCompleteDomains.length > 0) { for(var i=0; i < autoCompleteDomains.length; i++) { - if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) { + if(fromdb(autoCompleteDomains[i].path).toLowerCase() == domainPath.toLowerCase()) { domainId = autoCompleteDomains[i].id; break; } diff --git a/ui/scripts/cloud.core.volume.js b/ui/scripts/cloud.core.volume.js index f6fa8757494..03fc2f87ff2 100644 --- a/ui/scripts/cloud.core.volume.js +++ b/ui/scripts/cloud.core.volume.js @@ -32,12 +32,12 @@ function volumeGetSearchParams() { if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none" && $advancedSearchPopup.find("#domain").hasClass("textwatermark") == false) { - var domainName = $advancedSearchPopup.find("#domain").val(); - if (domainName != null && domainName.length > 0) { + var domainPath = $advancedSearchPopup.find("#domain").val(); + if (domainPath != null && domainPath.length > 0) { var domainId; if(autoCompleteDomains != null && autoCompleteDomains.length > 0) { for(var i=0; i < autoCompleteDomains.length; i++) { - if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) { + if(fromdb(autoCompleteDomains[i].path).toLowerCase() == domainPath.toLowerCase()) { domainId = autoCompleteDomains[i].id; break; }