mirror of https://github.com/apache/cloudstack.git
CLOUDSTACK-7520: [UI] keep advanced search parameters visible after search has been run.
- Preserve the advanced search parameters, so that when the advanced search box is shown again, it is populated with the values selected/entered previously, unless they have navigated away from the search results page, or applied any additional filters/search parameters. Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com> Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
This commit is contained in:
parent
91fd8d7cd5
commit
75cd79a238
|
|
@ -1854,6 +1854,7 @@
|
|||
//basic search
|
||||
var basicSearch = function() {
|
||||
$listView.removeData('advSearch');
|
||||
advancedSearchData = {};
|
||||
|
||||
$listView.data('page', 1);
|
||||
loadBody(
|
||||
|
|
@ -1930,6 +1931,8 @@
|
|||
);
|
||||
};
|
||||
|
||||
var advancedSearchData = {};
|
||||
|
||||
var closeAdvancedSearch = function() {
|
||||
$listView.find('.advanced-search .form-container:visible').remove();
|
||||
};
|
||||
|
|
@ -1941,6 +1944,11 @@
|
|||
return false;
|
||||
}
|
||||
|
||||
// Setup advanced search default values, when existing data is present
|
||||
$.each(listViewData.advSearchFields, function(fieldID, field) {
|
||||
field.defaultValue = advancedSearchData[fieldID];
|
||||
});
|
||||
|
||||
var form = cloudStack.dialog.createForm({
|
||||
noDialog: true,
|
||||
form: {
|
||||
|
|
@ -1949,6 +1957,7 @@
|
|||
},
|
||||
after: function(args) {
|
||||
advancedSearch(args);
|
||||
advancedSearchData = args.data;
|
||||
$listView.find('.button.search#basic_search').siblings('.search-bar').find('input').val(''); //clear basic search input field to avoid confusion of search result
|
||||
closeAdvancedSearch();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue