Skip to content

Commit 75cd79a

Browse files
Mihaela Stoicakaruturi
authored andcommitted
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>
1 parent 91fd8d7 commit 75cd79a

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

ui/scripts/ui/widgets/listView.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1854,6 +1854,7 @@
18541854
//basic search
18551855
var basicSearch = function() {
18561856
$listView.removeData('advSearch');
1857+
advancedSearchData = {};
18571858

18581859
$listView.data('page', 1);
18591860
loadBody(
@@ -1930,6 +1931,8 @@
19301931
);
19311932
};
19321933

1934+
var advancedSearchData = {};
1935+
19331936
var closeAdvancedSearch = function() {
19341937
$listView.find('.advanced-search .form-container:visible').remove();
19351938
};
@@ -1941,6 +1944,11 @@
19411944
return false;
19421945
}
19431946

1947+
// Setup advanced search default values, when existing data is present
1948+
$.each(listViewData.advSearchFields, function(fieldID, field) {
1949+
field.defaultValue = advancedSearchData[fieldID];
1950+
});
1951+
19441952
var form = cloudStack.dialog.createForm({
19451953
noDialog: true,
19461954
form: {
@@ -1949,6 +1957,7 @@
19491957
},
19501958
after: function(args) {
19511959
advancedSearch(args);
1960+
advancedSearchData = args.data;
19521961
$listView.find('.button.search#basic_search').siblings('.search-bar').find('input').val(''); //clear basic search input field to avoid confusion of search result
19531962
closeAdvancedSearch();
19541963
}

0 commit comments

Comments
 (0)