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

bug 8636: instance page - advanced search - change domain dropdown to input text field with autoComplete function.

This commit is contained in:
Jessica Wang 2011-02-23 15:47:48 -08:00
parent 2d207dc221
commit cc77245a80
4 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/jsp/instance.jsp
View File

@ -1295,9 +1295,13 @@ dictionary = {
<select class="select" id="adv_search_zone">
</select>
</li>
<li id="adv_search_domain_li" style="display: none;">
<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" />' />
@ -1315,8 +1319,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" />' />

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

@ -133,10 +133,8 @@ function bindAddAccountButton() {
initDialog("dialog_add_account", 450);
var $dialogAddAccount = $("#dialog_add_account");
//applyAutoComplete($field, commandString, jsonResponse1, jsonResponse2, objs);
applyAutoComplete($dialogAddAccount.find("#domain"), "listDomains", "listdomainsresponse", "domain");
applyAutoComplete($dialogAddAccount.find("#domain"), "listDomains", "listdomainsresponse", "domain");
/*
$dialogAddAccount.find("#domain").autocomplete({
source: function(request, response) {

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

@ -409,7 +409,7 @@ $(document).ready(function() {
var params = $("#middle_menu_pagination").data("params");
if(params == null)
return;
//lastSearchType = "advanced_search";
//(to-do: close auto-complete fields)
listMidMenuItems2(params.commandString, params.getSearchParamsFn, params.jsonResponse1, params.jsonResponse2, params.toMidmenuFn, params.toRightPanelFn, params.getMidmenuIdFn, params.isMultipleSelectionInMidMenu, 1);
}
});
@ -471,6 +471,9 @@ $(document).ready(function() {
}
}
applyAutoComplete($advancedSearchPopup.find("#domain"), "listDomains", "listdomainsresponse", "domain");
var domainSelect = $advancedSearchPopup.find("#adv_search_domain");
if(domainSelect.length>0 && $advancedSearchPopup.find("#adv_search_domain_li").css("display")!="none") {
$.ajax({

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

@ -36,20 +36,34 @@ function vmGetSearchParams() {
if (zone!=null && zone.length > 0)
moreCriteria.push("&zoneid="+todb(zone));
if ($advancedSearchPopup.find("#adv_search_domain_li").css("display") != "none") {
if($advancedSearchPopup.find("#adv_search_domain").length > 0) {
var domainId = $advancedSearchPopup.find("#adv_search_domain").val();
if(domainId!=null && domainId.length > 0)
moreCriteria.push("&domainid="+todb(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(autoCompleteItems != null && autoCompleteItems.length > 0) {
for(var i=0; i < autoCompleteItems.length; i++) {
if(fromdb(autoCompleteItems[i].name) == domainName) {
domainId = autoCompleteItems[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) {
var account = $advancedSearchPopup.find("#adv_search_account").val();
if(account!=null && account.length > 0)
moreCriteria.push("&account="+todb(account));
if(account != null && account.length > 0)
moreCriteria.push("&account="+todb(account));
}
}