apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

advanced search - fix a bug that clicking next page will lose advanced search parameters.

Browse Source
This commit is contained in:
Jessica Wang 2010-12-01 19:20:20 -08:00
parent aae2e95ed2
commit 51ed097cbf
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ function eventGetSearchParams() {
var moreCriteria = [];
var $advancedSearchPopup = $("#advanced_search_popup");
if ($advancedSearchPopup.length > 0 && $advancedSearchPopup.css("display") != "none") {
if (lastSearchType == "advanced_search" && $advancedSearchPopup.length > 0) {
var type = $advancedSearchPopup.find("#adv_search_type").val();
if (type!=null && trim(type).length > 0)
moreCriteria.push("&type="+todb(type));
@ -51,7 +51,7 @@ function eventGetSearchParams() {
}
else {
var searchInput = $("#basic_search").find("#search_input").val();
if (searchInput != null && searchInput.length > 0) {
if (lastSearchType == "basic_search" && searchInput != null && searchInput.length > 0) {
moreCriteria.push("&type="+todb(searchInput));
}
}

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

@ -217,7 +217,8 @@ $(document).ready(function() {
event.preventDefault();
var params = $("#middle_menu_pagination").data("params");
if(params == null)
return;
return;
lastSearchType = "basic_search";
listMidMenuItems2(params.commandString, params.getSearchParamsFn, params.jsonResponse1, params.jsonResponse2, params.toMidmenuFn, params.toRightPanelFn, params.getMidmenuIdFn, params.isMultipleSelectionInMidMenu, 1);
}
});
@ -237,6 +238,7 @@ $(document).ready(function() {
var params = $("#middle_menu_pagination").data("params");
if(params == null)
return;
lastSearchType = "advanced_search";
listMidMenuItems2(params.commandString, params.getSearchParamsFn, params.jsonResponse1, params.jsonResponse2, params.toMidmenuFn, params.toRightPanelFn, params.getMidmenuIdFn, params.isMultipleSelectionInMidMenu, 1);
$(this).hide();
return false;

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

@ -20,7 +20,7 @@ function vmGetSearchParams() {
var moreCriteria = [];
var $advancedSearchPopup = $("#advanced_search_popup");
if ($advancedSearchPopup.length > 0 && $advancedSearchPopup.css("display") != "none") {
if (lastSearchType == "advanced_search" && $advancedSearchPopup.length > 0) {
var name = $advancedSearchPopup.find("#adv_search_name").val();
if (name!=null && trim(name).length > 0)
moreCriteria.push("&name="+todb(name));
@ -47,7 +47,7 @@ function vmGetSearchParams() {
}
else {
var searchInput = $("#basic_search").find("#search_input").val();
if (searchInput != null && searchInput.length > 0) {
if (lastSearchType == "basic_search" && searchInput != null && searchInput.length > 0) {
moreCriteria.push("&name="+todb(searchInput));
}
}

2
ui/scripts/cloud.core.js
View File

@ -554,6 +554,7 @@ function clearMiddleMenu() {
$("#midmenu_container").empty();
$("#midmenu_action_link").hide();
clearAddButtonsOnTop();
lastSearchType = null;
$("#basic_search").find("#search_input").val("");
$("#advanced_search_container").empty();
$("#midmenu_prevbutton, #midmenu_nextbutton").hide();
@ -914,6 +915,7 @@ function getMidmenuId(jsonObj) {
return "midmenuItem_" + jsonObj.id;
}
var lastSearchType;
function listMidMenuItems2(commandString, getSearchParamsFn, jsonResponse1, jsonResponse2, toMidmenuFn, toRightPanelFn, getMidmenuIdFn, isMultipleSelectionInMidMenu, page) {
var params = {
"commandString": commandString,