ayanova/src/components/data-table.vue

@@ -792,7 +792,7 @@ export default {
   },
   beforeUpdate() {
     //WTF is beforeUpdate doing and what is resetlistview doing??
-    console.log("data-table: BEFORE UPDATE CALLED");
+    console.log("data-table: BEFORE UPDATE CALLED WTF?");
     if (this.clientCriteria != null && this.activeFilterId != 0) {
       this.resetListView();
     }
@@ -1121,6 +1121,7 @@ function saveFormSettings(vm) {
 ////////////////////
 //
 function loadFormSettings(vm) {
+  
   let formSettings = window.$gz.form.getFormSettings(vm.formKey);
 
   //process SAVED formsettings
@@ -1128,12 +1129,23 @@ function loadFormSettings(vm) {
     if (formSettings.saved.itemsPerPage) {
       vm.dataTablePagingOptions.itemsPerPage = formSettings.saved.itemsPerPage;
     }
-    if (formSettings.saved.dataTable.activeFilterId != null) {
+    //have a nonzero saved filter id
-      console.log(
+    if (
-        "data-table:loadFormSettings, has activeFilterId saved and is:",
+      formSettings.saved.dataTable.activeFilterId != null &&
-        formSettings.saved.dataTable.activeFilterId
+      formSettings.saved.dataTable.activeFilterId != 0
-      );
+    ) {
-      vm.activeFilterId = formSettings.saved.dataTable.activeFilterId;
+      //Is this filter id available in the list of filters?
+      if (
+        !vm.selectLists.savedFilters.find(
+          z => z.id == formSettings.saved.dataTable.activeFilterId
+        )
+      ) {
+        //Nope so just go to default
+        vm.activeFilterId = 0;
+      } else {
+        //Yup so set it
+        vm.activeFilterId = formSettings.saved.dataTable.activeFilterId;
+      }
     }
   }