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

Event page - advanced search dialog - include keyword from basic search when doing search.

This commit is contained in:
Jessica Wang 2010-12-17 15:58:10 -08:00
parent 6ff038a9c3
commit 34de842721
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/scripts/cloud.core.alert.js
View File

@ -19,18 +19,17 @@
function alertGetSearchParams() {
var moreCriteria = [];
var searchInput = $("#basic_search").find("#search_input").val();
if (searchInput != null && searchInput.length > 0) {
moreCriteria.push("&keyword="+todb(searchInput));
}
var $advancedSearchPopup = $("#advanced_search_popup");
if (lastSearchType == "advanced_search" && $advancedSearchPopup.length > 0) {
var type = $advancedSearchPopup.find("#adv_search_type").val();
if (type!=null && type.length > 0)
moreCriteria.push("&type="+todb(type));
}
else {
var searchInput = $("#basic_search").find("#search_input").val();
if (lastSearchType == "basic_search" && searchInput != null && searchInput.length > 0) {
moreCriteria.push("&keyword="+todb(searchInput));
}
}
}
return moreCriteria.join("");
}

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

@ -266,6 +266,7 @@ $(document).ready(function() {
lastSearchType = "advanced_search";
//$("#basic_search").find("#search_input").val("");
listMidMenuItems2(params.commandString, params.getSearchParamsFn, params.jsonResponse1, params.jsonResponse2, params.toMidmenuFn, params.toRightPanelFn, params.getMidmenuIdFn, params.isMultipleSelectionInMidMenu, 1);
$("#advanced_search_icon").removeClass("on");
$(this).hide();
return false;
}