diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js index 22182c12089..c7b4a4dda7c 100644 --- a/ui/scripts/ui/widgets/listView.js +++ b/ui/scripts/ui/widgets/listView.js @@ -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(); }