apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jessica Wang 2010-12-17 15:51:35 -08:00
parent c6633f9095
commit 3094df97e7
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,11 @@
function eventGetSearchParams() {
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();
@ -49,13 +54,7 @@ function eventGetSearchParams() {
if (enddate!=null && enddate.length > 0)
moreCriteria.push("&enddate="+todb(enddate));
}
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("");
}