From c1c11729425d6bf4cc8b3da7b136894dfd82d909 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 21 Jan 2022 23:41:41 +0000 Subject: [PATCH] case 4090 --- ayanova/src/router.js | 4 ++-- ayanova/src/views/home-review.vue | 10 +++++++--- ayanova/src/views/home-reviews.vue | 2 ++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ayanova/src/router.js b/ayanova/src/router.js index d876312f..76944700 100644 --- a/ayanova/src/router.js +++ b/ayanova/src/router.js @@ -180,13 +180,13 @@ export default new Router({ import(/* webpackChunkName: "ay-common" */ "./views/home-reminder.vue") }, { - path: "/home-reviews/:aType?/:objectId?", + path: "/home-reviews/:aType?/:objectId?/:name?", name: "home-reviews", component: () => import(/* webpackChunkName: "ay-common" */ "./views/home-reviews.vue") }, { - path: "/home-reviews/:recordid/:aType?/:objectId?", + path: "/home-reviews/:recordid/:aType?/:objectId?/:name?", name: "review-edit", component: () => import(/* webpackChunkName: "ay-common" */ "./views/home-review.vue") diff --git a/ayanova/src/views/home-review.vue b/ayanova/src/views/home-review.vue index e24754c4..ce3f0866 100644 --- a/ayanova/src/views/home-review.vue +++ b/ayanova/src/views/home-review.vue @@ -261,6 +261,9 @@ export default { }, async created() { const vm = this; + if (vm.$route.params.name) { + vm.name = vm.$route.params.name; + } try { await initForm(vm); vm.rights = window.$gz.role.getRights(window.$gz.type.Review); @@ -298,7 +301,6 @@ export default { if (!vm.obj.objectId || !vm.obj.aType) { throw "AType and ObjectId are required to create a review"; } - vm.name = vm.$route.params.name; } } window.$gz.form.setFormState({ @@ -377,6 +379,7 @@ export default { window.$gz.form.setErrorBoxErrors(vm); } else { vm.obj = res.data; + vm.name = res.data.reviewObjectViz; generateMenu(vm); window.$gz.form.setFormState({ vm: vm, @@ -417,13 +420,14 @@ export default { name: "review-edit", params: { recordid: res.data.id, - obj: res.data, //??THERE MIGHT HAVE BEEN ANOTHER PARAMETER HERE before cleanup??? - name: this.name + obj: res.data, + name: res.data.reviewObjectViz } }); } else { //PUT vm.obj.concurrency = res.data.concurrency; + vm.name = res.data.reviewObjectViz; } window.$gz.form.setFormState({ vm: vm, diff --git a/ayanova/src/views/home-reviews.vue b/ayanova/src/views/home-reviews.vue index 738d0bc0..4021a94c 100644 --- a/ayanova/src/views/home-reviews.vue +++ b/ayanova/src/views/home-reviews.vue @@ -38,11 +38,13 @@ export default { }; }, async created() { + console.log("hmrvw-created route params:", this.$route.params); const vm = this; vm.rights = window.$gz.role.getRights(window.$gz.type.Review); window.$gz.eventBus.$on("menu-click", clickHandler); vm.objectId = window.$gz.util.stringToIntOrNull(vm.$route.params.objectId); vm.aType = window.$gz.util.stringToIntOrNull(vm.$route.params.aType); + vm.name = vm.$route.params.name; //OPTIONAL FILTER if (vm.objectId && vm.objectId != 0 && vm.aType) { //OBJECTID,AYATYPE