This commit is contained in:
2020-02-19 15:54:16 +00:00
parent 279730b87e
commit 63dc693201
2 changed files with 14 additions and 6 deletions

View File

@@ -157,7 +157,8 @@ export default {
"Loading", "Loading",
"AM", "AM",
"PM", "PM",
"DataListView" "DataListView",
"FilterUnsaved"
], ],
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////

View File

@@ -381,11 +381,12 @@ export default {
listViewChanged: function() { listViewChanged: function() {
//console.log("listViewchanged: TOP"); //console.log("listViewchanged: TOP");
var vm = this; var vm = this;
//find out if we need to trigger the get data or if it will happen automatically //If listview had changed it can only have changed *away* from the unsaved filter item if it's present so just remove that if it exists
//when we set page to 0 window.$gz._.remove(vm.pickLists.listViews, function(n) {
//console.log(vm.dataTablePagingOptions.page); return n.id == -1;
});
var ShouldGetData = vm.dataTablePagingOptions.page == 1; var ShouldGetData = vm.dataTablePagingOptions.page == 1;
// vm.pickLists.listViews
if (vm.listViewId == 0) { if (vm.listViewId == 0) {
//default view, no saved, no cached //default view, no saved, no cached
vm.listView = undefined; vm.listView = undefined;
@@ -680,7 +681,13 @@ function populatePickLists(vm) {
} else { } else {
vm.pickLists.listViews = res.data; vm.pickLists.listViews = res.data;
window.$gz.form.addNoSelectionItem(vm.pickLists.listViews); window.$gz.form.addNoSelectionItem(vm.pickLists.listViews);
//vm.pickLists.availableDataListViews.unshift({ name: "-", id: 0 }); //add UNSAVED FILTER if -1
if (vm.listViewId == -1) {
vm.pickLists.listViews.unshift({
name: vm.lt("FilterUnsaved"),
id: -1
});
}
} }
}); });
} }