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

bug 8636: advanced search in volume page, snapshot page - change domain dropdown to autoComplete input textbox.

This commit is contained in:
Jessica Wang 2011-02-28 11:01:07 -08:00
parent 8658fbd1d4
commit d47b5f3a5b
7 changed files with 56 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/jsp/snapshot.jsp
View File

@ -219,8 +219,12 @@ dictionary = {
<form action="#" method="post">
<ol>
<li id="adv_search_domain_li" style="display: none;">
<input class="text textwatermark" type="text" id="domain" value='<fmt:message key="label.by.domain" />' />
<div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
<!--
<select class="select" id="adv_search_domain">
</select>
-->
</li>
<li id="adv_search_account_li" style="display: none;">
<input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />

4
ui/jsp/volume.jsp
View File

@ -778,8 +778,12 @@ dictionary = {
</select>
</li>
<li id="adv_search_domain_li" style="display: none;">
<input class="text textwatermark" type="text" id="domain" value='<fmt:message key="label.by.domain" />' />
<div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
<!--
<select class="select" id="adv_search_domain">
</select>
-->
</li>
<li id="adv_search_account_li" style="display: none;">
<input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />

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

@ -134,7 +134,7 @@ function bindAddAccountButton() {
var $dialogAddAccount = $("#dialog_add_account");
applyAutoCompleteToDomainField($dialogAddAccount.find("#domain"), "listDomains", "listdomainsresponse", "domain");
applyAutoCompleteToDomainField($dialogAddAccount.find("#domain"));
/*
$dialogAddAccount.find("#domain").autocomplete({
source: function(request, response) {

2
ui/scripts/cloud.core.init.js
View File

@ -475,7 +475,7 @@ $(document).ready(function() {
}
applyAutoCompleteToDomainField($advancedSearchPopup.find("#domain"), "listDomains", "listdomainsresponse", "domain");
applyAutoCompleteToDomainField($advancedSearchPopup.find("#domain"));
var domainSelect = $advancedSearchPopup.find("#adv_search_domain");
if(domainSelect.length>0 && $advancedSearchPopup.find("#adv_search_domain_li").css("display")!="none") {

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

@ -1052,7 +1052,7 @@ function getMidmenuId(jsonObj) {
}
var autoCompleteDomains = [];
function applyAutoCompleteToDomainField($field, commandString, jsonResponse1, jsonResponse2) {
function applyAutoCompleteToDomainField($field) {
$field.autocomplete({
source: function(request, response) {
$.ajax({

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

@ -25,12 +25,29 @@ function snapshotGetSearchParams() {
}
var $advancedSearchPopup = getAdvancedSearchPopupInSearchContainer();
if ($advancedSearchPopup.length > 0 && $advancedSearchPopup.css("display") != "none" ) {
if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none") {
var domainId = $advancedSearchPopup.find("#adv_search_domain").val();
if (domainId!=null && domainId.length > 0)
moreCriteria.push("&domainid="+domainId);
}
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 domainId;
if(autoCompleteDomains != null && autoCompleteDomains.length > 0) {
for(var i=0; i < autoCompleteDomains.length; i++) {
if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) {
domainId = autoCompleteDomains[i].id;
break;
}
}
}
if(domainId == null) {
showError(false, $advancedSearchPopup.find("#domain"), $advancedSearchPopup.find("#domain_errormsg"), g_dictionary["label.not.found"]);
}
else { //e.g. domainId == 5 (number)
showError(true, $advancedSearchPopup.find("#domain"), $advancedSearchPopup.find("#domain_errormsg"), null)
moreCriteria.push("&domainid="+todb(domainId));
}
}
}
if ($advancedSearchPopup.find("#adv_search_account_li").css("display") != "none"
&& $advancedSearchPopup.find("#adv_search_account").hasClass("textwatermark") == false) {

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

@ -30,11 +30,28 @@ function volumeGetSearchParams() {
if (zone!=null && zone.length > 0)
moreCriteria.push("&zoneId="+zone);
if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none") {
var domainId = $advancedSearchPopup.find("#adv_search_domain").val();
if (domainId!=null && domainId.length > 0)
moreCriteria.push("&domainid="+domainId);
}
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 domainId;
if(autoCompleteDomains != null && autoCompleteDomains.length > 0) {
for(var i=0; i < autoCompleteDomains.length; i++) {
if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) {
domainId = autoCompleteDomains[i].id;
break;
}
}
}
if(domainId == null) {
showError(false, $advancedSearchPopup.find("#domain"), $advancedSearchPopup.find("#domain_errormsg"), g_dictionary["label.not.found"]);
}
else { //e.g. domainId == 5 (number)
showError(true, $advancedSearchPopup.find("#domain"), $advancedSearchPopup.find("#domain_errormsg"), null)
moreCriteria.push("&domainid="+todb(domainId));
}
}
}
if ($advancedSearchPopup.find("#adv_search_account_li").css("display") != "none"
&& $advancedSearchPopup.find("#adv_search_account").hasClass("textwatermark") == false) {