ayanova/src/components/gz-data-table.vue

@@ -912,19 +912,20 @@ function loadFormSettings(vm) {
 ////////////////////
 //
 function untokenizeListView(lv) {
+  //it has one or more tokens
+  //iterate the array and build a new array with substituted tokens with the correct date and time in them
+  console.log(lv);
+  //console.log(JSON.parse(lv));
+  console.log("test:thisweek");
+  console.log(relativeDatefilterCalculator.tokenToDates("*thisweek*"));
   //[{"fld":"widgetname"},{"fld":"widgetstartdate","filter":{"items":[{"op":"=","value":"*past90days*","token":true}]}},{"fld":"widgetenddate"}]
   if (lv == null) {
     return lv;
   }
   //See if it has any date tokens
   if (lv.indexOf('"token":true') == -1) {
-    return;
+    return lv;
   }
-  //it has one or more tokens
-  //iterate the array and build a new array with substituted tokens with the correct date and time in them
-  console.log(lv);
-  //console.log(JSON.parse(lv));
-  console.log("test:lastweek");
-  console.log(relativeDatefilterCalculator.tokenToDates("*lastweek*"));
+  return lv;
 }
 </script>