diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index cfe796d3..0bac446f 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -93,14 +93,7 @@ todo: DOC ENTRY (or is this defensive for no reason?) CURRENTLY DOING: CustomerServiceRequest - Front inside form - needs acceptnew, reject, acceptexisting working and fleshed out - needs restrictions on field edits and readonly once accepted or not open anyway - Needs report print test - - TWO UI's one for inside user and one for outside users - UI form make sure once accepted can't be changed to not accepted, it's one way trip - + MIGRATE EACH OBJECT DEV CYCLE: FIRST diff --git a/ayanova/src/views/svc-csr.vue b/ayanova/src/views/svc-csr.vue index c986484d..ba87fa0c 100644 --- a/ayanova/src/views/svc-csr.vue +++ b/ayanova/src/views/svc-csr.vue @@ -590,42 +590,6 @@ export default { window.$gz.errorHandler.handleFormError(error, vm); } }, - async duplicate() { - let vm = this; - if (!vm.canDuplicate || vm.$route.params.recordid == 0) { - return; - } - window.$gz.form.setFormState({ - vm: vm, - loading: true - }); - let url = API_BASE_URL + "duplicate/" + vm.$route.params.recordid; - - try { - window.$gz.form.deleteAllErrorBoxErrors(vm); - let res = await window.$gz.api.upsert(url); - if (res.error) { - vm.formState.serverError = res.error; - window.$gz.form.setErrorBoxErrors(vm); - } else { - //Navigate to new record - this.$router.push({ - name: "csr-edit", - params: { - recordid: res.data.id, - obj: res.data // Pass data object to new form - } - }); - } - } catch (ex) { - window.$gz.errorHandler.handleFormError(ex, vm); - } finally { - window.$gz.form.setFormState({ - vm: vm, - loading: false - }); - } - }, async reject() { let vm = this; if (vm.obj.status != 0 || vm.$route.params.recordid == 0) { @@ -721,15 +685,7 @@ async function clickHandler(menuItem) { case "delete": m.vm.remove(); break; - case "new": - m.vm.$router.push({ - name: "csr-edit", - params: { recordid: 0, new: true } - }); - break; - case "duplicate": - m.vm.duplicate(); - break; + case "reject": m.vm.reject(); break; @@ -814,7 +770,11 @@ function generateMenu(vm) { }); } - if (vm.rights.delete && vm.$route.params.recordid != 0) { + if ( + vm.rights.delete && + vm.$route.params.recordid != 0 && + !vm.formState.readOnly + ) { menuOptions.menuItems.push({ title: "Delete", icon: "$ayiTrashAlt", @@ -844,24 +804,6 @@ function generateMenu(vm) { }); } - if (vm.rights.change) { - menuOptions.menuItems.push({ - title: "New", - icon: "$ayiPlus", - key: FORM_KEY + ":new", - vm: vm - }); - } - - if (vm.rights.change) { - menuOptions.menuItems.push({ - title: "Duplicate", - icon: "$ayiClone", - key: FORM_KEY + ":duplicate", - vm: vm - }); - } - menuOptions.menuItems.push({ divider: true, inset: false }); if (vm.obj.status == 0) {