diff --git a/ayanova/src/components/gzconfirm.vue b/ayanova/src/components/gzconfirm.vue
index ad13ebd5..696f3ca2 100644
--- a/ayanova/src/components/gzconfirm.vue
+++ b/ayanova/src/components/gzconfirm.vue
@@ -27,6 +27,7 @@
v-model="isVisible"
:max-width="options.width"
@keydown.esc="cancel"
+ data-cy="gzconfirm"
>
@@ -46,11 +47,16 @@
color="primary darken-1"
text
@click.native="cancel"
+ data-cy="gzconfirm:nobutton"
>{{ options.noButtonText }}
- {{
- options.yesButtonText
- }}
+ {{ options.yesButtonText }}
diff --git a/ayanova/src/components/gznotify.vue b/ayanova/src/components/gznotify.vue
index b0740da2..17b231ce 100644
--- a/ayanova/src/components/gznotify.vue
+++ b/ayanova/src/components/gznotify.vue
@@ -1,10 +1,19 @@
-
+
{{ currentNotification.message }}
-
+
{{ this.$root.$gz.translation.get("More") }}
diff --git a/ayanova/src/views/widget.vue b/ayanova/src/views/widget.vue
index 01093279..63f6f40c 100644
--- a/ayanova/src/views/widget.vue
+++ b/ayanova/src/views/widget.vue
@@ -255,9 +255,9 @@ export default {
readOnly: readOnly
});
- //bugbug WTF? This doesn't make sense, if it's an attempt to hide delete button then that's wrong
- //it's a new record so it can't be deleted so...
- vm.rights.delete = false;
+ // //bugbug WTF? This doesn't make sense, if it's an attempt to hide delete button then that's wrong
+ // //it's a new record so it can't be deleted so...
+ // vm.rights.delete = false;
generateMenu(vm);
}
})
@@ -635,7 +635,7 @@ function generateMenu(vm) {
});
}
- if (vm.rights.delete) {
+ if (vm.rights.delete && vm.$route.params.recordid != 0) {
menuOptions.menuItems.push({
title: window.$gz.translation.get("Delete"),
icon: "fa-trash-alt",
diff --git a/ayanova/tests/e2e/specs/widget-crud.js b/ayanova/tests/e2e/specs/widget-crud.js
index 1c78b820..4de10434 100644
--- a/ayanova/tests/e2e/specs/widget-crud.js
+++ b/ayanova/tests/e2e/specs/widget-crud.js
@@ -113,5 +113,6 @@ describe("WIDGET FORM", () => {
//delete the record
cy.get('[data-cy="widget-edit:delete"]').click();
+ cy.get('[data-cy="gzconfirm:yesbutton"]').click();
});
});