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

events page - implement basic search.

This commit is contained in:
Jessica Wang 2010-12-01 15:54:31 -08:00
parent 6a859a9322
commit 75789eb600
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,8 +16,39 @@
*
*/
function eventGetSearchParams() {
return "";
function eventGetSearchParams() {
var moreCriteria = [];
var advanced;
if (advanced != null && advanced) {
var type = $("#advanced_search #adv_search_type").val();
var level = $("#advanced_search #adv_search_level").val();
var domainId = $("#advanced_search #adv_search_domain").val();
var account = $("#advanced_search #adv_search_account").val();
var startdate = $("#advanced_search #adv_search_startdate").val();
var enddate = $("#advanced_search #adv_search_enddate").val();
var moreCriteria = [];
if (type!=null && trim(type).length > 0)
moreCriteria.push("&type="+type);
if (level!=null && level.length > 0)
moreCriteria.push("&level="+level);
if (domainId!=null && domainId.length > 0)
moreCriteria.push("&domainid="+domainId);
if (account!=null && account.length > 0)
moreCriteria.push("&account="+todb(account));
if (startdate!=null && startdate.length > 0)
moreCriteria.push("&startdate="+todb(startdate));
if (enddate!=null && enddate.length > 0)
moreCriteria.push("&enddate="+todb(enddate));
}
else {
var searchInput = $("#basic_search").find("#search_input").val();
if (searchInput != null && searchInput.length > 0) {
moreCriteria.push("&type="+searchInput);
}
}
return moreCriteria.join("");
}
function afterLoadEventJSP() {

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

@ -39,8 +39,7 @@ function vmGetSearchParams() {
if (pod!=null && pod.length > 0)
moreCriteria.push("&podId="+pod);
if (account!=null && account.length > 0)
moreCriteria.push("&account="+account);
commandString = "command=listVirtualMachines&page="+currentPage+moreCriteria.join("")+"&response=json";
moreCriteria.push("&account="+account);
}
else {
var searchInput = $("#basic_search").find("#search_input").val();