fix merge conflict

fix merge conflict 5 fix tag label fix CR notes fix filtes conbined
2021-07-14 14:21:28 +00:00
parent d4adc42138
commit 6829c1ab3a
14 changed files with 437 additions and 37 deletions
--- a/resources/assets/js/home/Inbox/Todo.vue
+++ b/resources/assets/js/home/Inbox/Todo.vue
@@ -369,7 +369,9 @@ export default {
      };

      _.forIn(this.filters, function (item, key) {
-        filters[item.filterVar] = item.value;
+          if(filters && item.value) {
+              filters[item.filterVar] = item.value;
+          }
      });
      return new Promise((resolutionFunc, rejectionFunc) => {
        api.cases