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

Refresh button - when refresh button is clicked, populate search result again if middle menu is previously populated with search result.

This commit is contained in:
Jessica Wang 2011-01-20 18:16:19 -08:00
parent 953c862713
commit 1b977acaf9
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -358,7 +358,7 @@ $(document).ready(function() {
var params = $("#middle_menu_pagination").data("params");
if(params == null)
return;
lastSearchType = "basic_search";
//lastSearchType = "basic_search";
listMidMenuItems2(params.commandString, params.getSearchParamsFn, params.jsonResponse1, params.jsonResponse2, params.toMidmenuFn, params.toRightPanelFn, params.getMidmenuIdFn, params.isMultipleSelectionInMidMenu, 1);
}
});
@ -396,7 +396,7 @@ $(document).ready(function() {
var params = $("#middle_menu_pagination").data("params");
if(params == null)
return;
lastSearchType = "advanced_search";
//lastSearchType = "advanced_search";
listMidMenuItems2(params.commandString, params.getSearchParamsFn, params.jsonResponse1, params.jsonResponse2, params.toMidmenuFn, params.toRightPanelFn, params.getMidmenuIdFn, params.isMultipleSelectionInMidMenu, 1);
}
});

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

@ -970,9 +970,12 @@ function getMidmenuId(jsonObj) {
return "midmenuItem_" + jsonObj.id;
}
var lastSearchType;
//var lastSearchType;
var currentCommandString;
function listMidMenuItems2(commandString, getSearchParamsFn, jsonResponse1, jsonResponse2, toMidmenuFn, toRightPanelFn, getMidmenuIdFn, isMultipleSelectionInMidMenu, page) {
$("#midmenu_container").hide();
$("#midmenu_spinning_wheel").show();
var params = {
"commandString": commandString,
"getSearchParamsFn": getSearchParamsFn,
@ -1046,12 +1049,14 @@ var currentRightPanelJSP = null;
function listMidMenuItems(commandString, getSearchParamsFn, jsonResponse1, jsonResponse2, rightPanelJSP, afterLoadRightPanelJSPFn, toMidmenuFn, toRightPanelFn, getMidmenuIdFn, isMultipleSelectionInMidMenu, leftmenuId, refreshDataBindingFn) {
clearMiddleMenu();
showMiddleMenu();
$("#midmenu_container").hide();
$("#midmenu_spinning_wheel").show();
currentLeftMenuId = leftmenuId;
$("#right_panel").data("onRefreshFn", function() {
$("#"+leftmenuId).click();
//$("#"+leftmenuId).click();
var params = $("#middle_menu_pagination").data("params");
if(params == null)
return;
listMidMenuItems2(params.commandString, params.getSearchParamsFn, params.jsonResponse1, params.jsonResponse2, params.toMidmenuFn, params.toRightPanelFn, params.getMidmenuIdFn, params.isMultipleSelectionInMidMenu, 1);
});
if (currentRightPanelJSP != rightPanelJSP) {