diff --git a/ayanova/src/api/gzdialog.js b/ayanova/src/api/gzdialog.js index e099e1c7..e7a44f05 100644 --- a/ayanova/src/api/gzdialog.js +++ b/ayanova/src/api/gzdialog.js @@ -92,7 +92,6 @@ TODO: // }, confirmDelete() { return VM_LOCAL.$root.$gzconfirm({ - title: window.$gz.locale.get("Delete"), message: window.$gz.locale.get("DeletePrompt"), yesButtonText: window.$gz.locale.get("Delete"), noButtonText: window.$gz.locale.get("Cancel") @@ -101,23 +100,29 @@ TODO: ///////////////////////////////////// // Are you sure you want to delete? // - confirmLeaveUnsaved(vm) { - return vm.$dialog.warning({ - text: window.$gz.locale.get("AreYouSureUnsavedChanges"), - title: window.$gz.locale.get("Leave"), - icon: "fa-exclamation-triangle", - actions: [ - { - text: window.$gz.locale.get("Cancel"), - key: false - }, - { - text: window.$gz.locale.get("Leave"), - color: "red", - key: true - } - ] + confirmLeaveUnsaved() { + return VM_LOCAL.$root.$gzconfirm({ + message: window.$gz.locale.get("AreYouSureUnsavedChanges"), + yesButtonText: window.$gz.locale.get("Leave"), + noButtonText: window.$gz.locale.get("Cancel") }); + + // return vm.$dialog.warning({ + // text: window.$gz.locale.get("AreYouSureUnsavedChanges"), + // title: window.$gz.locale.get("Leave"), + // icon: "fa-exclamation-triangle", + // actions: [ + // { + // text: window.$gz.locale.get("Cancel"), + // key: false + // }, + // { + // text: window.$gz.locale.get("Leave"), + // color: "red", + // key: true + // } + // ] + // }); }, ///////////////////////////////////// // Display LT message with wait for ok diff --git a/ayanova/src/views/inventory-widget-edit.vue b/ayanova/src/views/inventory-widget-edit.vue index 5a9f50fc..1007048d 100644 --- a/ayanova/src/views/inventory-widget-edit.vue +++ b/ayanova/src/views/inventory-widget-edit.vue @@ -293,9 +293,9 @@ export default { // don't forget to call next() }, beforeRouteLeave(to, from, next) { - var vm = this; + //var vm = this; if (this.formState.dirty && !JUST_DELETED) { - window.$gz.dialog.confirmLeaveUnsaved(vm).then(dialogResult => { + window.$gz.dialog.confirmLeaveUnsaved().then(dialogResult => { if (dialogResult == true) { next(); } else { @@ -497,7 +497,7 @@ export default { }, remove() { var vm = this; - window.$gz.dialog.confirmDelete(vm).then(dialogResult => { + window.$gz.dialog.confirmDelete().then(dialogResult => { if (dialogResult == true) { //do the delete vm.formState.loading = true;