diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index 9d38504a..0ebd806b 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -386,7 +386,7 @@ CURRENTLY DOING: wo completion list -todo: notify event list table needs to show status of workorder (all fields) ideally +todo: notify subscription list table needs to show status of workorder (all fields) ideally otherwise if you have multiple wostatusage notifications they all appear the same Also it shows the email address even when it's set to in-app delivery which looks concerning and should not happen this one might be tricky to get right, if can't then remove it entirely and just show if email or inapp delivery only not the address diff --git a/ayanova/src/views/home-notify-subscription.vue b/ayanova/src/views/home-notify-subscription.vue index dcd5eb41..7646755d 100644 --- a/ayanova/src/views/home-notify-subscription.vue +++ b/ayanova/src/views/home-notify-subscription.vue @@ -494,18 +494,12 @@ export default { //clear any errors vm might be around from previous submit window.$gz.form.deleteAllErrorBoxErrors(vm); - //add in password and login if changed - let submitObject = vm.obj; - if (vm.password != null && vm.password != "") { - submitObject.password = vm.password; + //don't send the deliveryaddress if it's an in-app notification + if (vm.obj.deliveryMethod == 1) { + vm.obj.deliveryAddress = null; } - if (vm.login != null && vm.login != "") { - submitObject.login = vm.login; - } - if (submitObject.roles == null) { - submitObject.roles = 0; - } - let res = await window.$gz.api.upsert(url, submitObject); + + let res = await window.$gz.api.upsert(url, vm.obj); if (res.error) { vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm);