etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 12649: cloudstack 2.2.Y UI - domain fields on all dialog boxes - show full domain path instead of domain name. (reviewed-by: Brian)

This commit is contained in:
Jessica Wang 2012-02-03 14:38:31 -08:00
parent 1a47c11e76
commit f6dba09677
16 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/scripts/cloud.core.account.js
View File

@ -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;
}

12
ui/scripts/cloud.core.diskoffering.js
View File

@ -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;
}

6
ui/scripts/cloud.core.event.js
View File

@ -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;
}

6
ui/scripts/cloud.core.instance.js
View File

@ -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;
}

6
ui/scripts/cloud.core.ipaddress.js
View File

@ -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;
}

6
ui/scripts/cloud.core.iso.js
View File

@ -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;
}

6
ui/scripts/cloud.core.js
View File

@ -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));
}
}
});

18
ui/scripts/cloud.core.network.js
View File

@ -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;
}

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

@ -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;

6
ui/scripts/cloud.core.router.js
View File

@ -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;
}

6
ui/scripts/cloud.core.securitygroup.js
View File

@ -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;
}

12
ui/scripts/cloud.core.serviceoffering.js
View File

@ -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;
}

6
ui/scripts/cloud.core.snapshot.js
View File

@ -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;
}

12
ui/scripts/cloud.core.systemserviceoffering.js
View File

@ -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;
}

6
ui/scripts/cloud.core.template.js
View File

@ -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;
}

6
ui/scripts/cloud.core.volume.js
View File

@ -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;
}