diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 6217eb8e..8fe4defe 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -740,6 +740,10 @@ BUILD 130 CHANGES OF NOTE
- case 3959 updated with info to you and also implemented a slight change as mentioned in case
- Alert notes (was popup notes in v7) changed display color from red to orange as AyaNova errors display in red in similar location don't want them confused
- case 3960 fixed
+- case 3961 fixed
+- case 3962 fixed
+- case 3963 fixed
+
diff --git a/ayanova/src/components/data-table.vue b/ayanova/src/components/data-table.vue
index 7ffe2e96..5235cdba 100644
--- a/ayanova/src/components/data-table.vue
+++ b/ayanova/src/components/data-table.vue
@@ -37,8 +37,6 @@
$clear
-
-
@@ -275,8 +273,9 @@
-
- {{ c.v }}
+ {{
+ c.v
+ }}
@@ -492,8 +491,9 @@
-
- {{ c.v }}
+ {{
+ c.v
+ }}
@@ -662,6 +662,11 @@ export default {
}
},
methods: {
+ ensureUrlFormat: function(u) {
+ if (u && u.length > 0) {
+ return u.indexOf("://") === -1 ? "//" + u : u;
+ }
+ },
preFilterNav: function() {
window.$gz.eventBus.$emit("openobject", {
type: this.preFilterMode.ayatype,
@@ -697,7 +702,7 @@ export default {
}
return clr;
},
- async clearFilter() {
+ async clearFilter(reloadData) {
//Reset back to DEFAULT filter
setActiveFilter(this); //will not trigger refresh yet
@@ -710,7 +715,9 @@ export default {
window.$gz.form.setErrorBoxErrors(vm);
} else {
await fetchSavedFilterList(this);
- await this.getDataFromApi();
+ if (reloadData) {
+ await this.getDataFromApi();
+ }
}
},
clearFilterIcon() {
@@ -1270,6 +1277,11 @@ async function initForm(vm) {
vm.timeZoneName = window.$gz.locale.getResolvedTimeZoneName();
await fetchSavedFilterList(vm);
loadFormSettings(vm);
+
+ //If prefilter mode clear any prior filters applied
+ if (vm.preFilterMode != null) {
+ await vm.clearFilter(false);
+ }
}
////////////////////
@@ -1320,7 +1332,6 @@ function saveFormSettings(vm) {
function setActiveFilter(vm, desiredId) {
//Handle a change of filter, ensure it exists, if not then try to select default and if not that then just put in a zero
//if desiredId is falsey then try to pick the default
-
if (desiredId) {
if (vm.selectLists.savedFilters.find(z => z.id == desiredId)) {
vm.activeFilterId = desiredId;
@@ -1334,6 +1345,7 @@ function setActiveFilter(vm, desiredId) {
vm.activeFilterId = dflt.id;
return;
}
+
vm.activeFilterId = 0;
}
diff --git a/ayanova/src/views/svc-quote-status-edit.vue b/ayanova/src/views/svc-quote-status-edit.vue
index 6a952ad5..7af49569 100644
--- a/ayanova/src/views/svc-quote-status-edit.vue
+++ b/ayanova/src/views/svc-quote-status-edit.vue
@@ -432,7 +432,7 @@ async function clickHandler(menuItem) {
case "delete":
m.vm.remove();
break;
- case "list":
+ case "statuslist":
m.vm.$router.push({
name: "svc-quote-status"
});