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

volume page - implement basic search.

Browse Source
This commit is contained in:
Jessica Wang 2010-12-01 16:08:47 -08:00
parent 75789eb600
commit b482b1c797
3 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,11 +29,11 @@ function eventGetSearchParams() {
var enddate = $("#advanced_search #adv_search_enddate").val();
var moreCriteria = [];
if (type!=null && trim(type).length > 0)
moreCriteria.push("&type="+type);
moreCriteria.push("&type="+todb(type));
if (level!=null && level.length > 0)
moreCriteria.push("&level="+level);
moreCriteria.push("&level="+todb(level));
if (domainId!=null && domainId.length > 0)
moreCriteria.push("&domainid="+domainId);
moreCriteria.push("&domainid="+todb(domainId));
if (account!=null && account.length > 0)
moreCriteria.push("&account="+todb(account));
if (startdate!=null && startdate.length > 0)
@ -44,7 +44,7 @@ function eventGetSearchParams() {
else {
var searchInput = $("#basic_search").find("#search_input").val();
if (searchInput != null && searchInput.length > 0) {
moreCriteria.push("&type="+searchInput);
moreCriteria.push("&type="+todb(searchInput));
}
}

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

@ -31,20 +31,20 @@ function vmGetSearchParams() {
if (name!=null && trim(name).length > 0)
moreCriteria.push("&name="+todb(name));
if (state!=null && state.length > 0)
moreCriteria.push("&state="+state);
moreCriteria.push("&state="+todb(state));
if (zone!=null && zone.length > 0)
moreCriteria.push("&zoneid="+zone);
moreCriteria.push("&zoneid="+todb(zone));
if (domainId!=null && domainId.length > 0)
moreCriteria.push("&domainid="+domainId);
moreCriteria.push("&domainid="+todb(domainId));
if (pod!=null && pod.length > 0)
moreCriteria.push("&podId="+pod);
moreCriteria.push("&podId="+todb(pod));
if (account!=null && account.length > 0)
moreCriteria.push("&account="+account);
moreCriteria.push("&account="+todb(account));
}
else {
var searchInput = $("#basic_search").find("#search_input").val();
if (searchInput != null && searchInput.length > 0) {
moreCriteria.push("&name="+searchInput);
moreCriteria.push("&name="+todb(searchInput));
}
}

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

@ -16,8 +16,36 @@
*
*/
function volumeGetSearchParams() {
return "";
function volumeGetSearchParams() {
var moreCriteria = [];
var advanced;
if (advanced != null && advanced) {
var name = $("#advanced_search #adv_search_name").val();
var zone = $("#advanced_search #adv_search_zone").val();
var pod = $("#advanced_search #adv_search_pod").val();
var domainId = $("#advanced_search #adv_search_domain").val();
var account = $("#advanced_search #adv_search_account").val();
var moreCriteria = [];
if (name!=null && trim(name).length > 0)
moreCriteria.push("&name="+todb(name));
if (zone!=null && zone.length > 0)
moreCriteria.push("&zoneId="+todb(zone));
if (pod!=null && pod.length > 0)
moreCriteria.push("&podId="+todb(pod));
if (domainId!=null && domainId.length > 0)
moreCriteria.push("&domainid="+todb(domainId));
if (account!=null && account.length > 0)
moreCriteria.push("&account="+todb(account));
}
else {
var searchInput = $("#basic_search").find("#search_input").val();
if (searchInput != null && searchInput.length > 0) {
moreCriteria.push("&name="+todb(searchInput));
}
}
return moreCriteria.join("");
}
function afterLoadVolumeJSP() {