From e624fa29bb63f1ae922540b45f20d1b8e260e27e Mon Sep 17 00:00:00 2001 From: Tiago <62375155+TiagoKocevar@users.noreply.github.com> Date: Mon, 28 Aug 2023 16:13:38 +0200 Subject: [PATCH] =?UTF-8?q?Bug=20Nutzer=20kann=20Abfrage=20L=C3=B6schen=20?= =?UTF-8?q?=20Popup=20=C3=B6ffnen=20(#100)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🐛 Bugfix Löschen Abfrage * Review Änderungen implementiert --------- Co-authored-by: tiago.kocevar --- frontend/src/mixins/security/AbfrageSecurityMixin.ts | 5 +++++ frontend/src/views/Abfrage.vue | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/frontend/src/mixins/security/AbfrageSecurityMixin.ts b/frontend/src/mixins/security/AbfrageSecurityMixin.ts index 0fab4f643..4e4fba831 100644 --- a/frontend/src/mixins/security/AbfrageSecurityMixin.ts +++ b/frontend/src/mixins/security/AbfrageSecurityMixin.ts @@ -33,4 +33,9 @@ export default class AbfrageSecurityMixin extends Mixins(SecurityMixin) { abfrage.abfrage?.statusAbfrage === StatusAbfrage.InBearbeitungSachbearbeitung : false; } + + public isEditableByAdmin(): boolean { + const abfrage: InfrastrukturabfrageModel = this.$store.getters["search/selectedAbfrage"]; + return !_.isNil(abfrage) ? this.isRoleAdmin() : false; + } } diff --git a/frontend/src/views/Abfrage.vue b/frontend/src/views/Abfrage.vue index 179cca4f2..8d45d69c1 100644 --- a/frontend/src/views/Abfrage.vue +++ b/frontend/src/views/Abfrage.vue @@ -180,6 +180,7 @@ color="primary" elevation="1" style="width: 200px" + :disabled="!isDeleteable()" @click="deleteAbfrage()" v-text="'Löschen'" /> @@ -396,6 +397,10 @@ export default class Abfrage extends Mixins( this.isDeleteDialogAbfrageOpen = true; } + private isDeleteable(): boolean { + return this.isEditableByAbfrageerstellung() || this.isEditableByAdmin(); + } + private statusUebergang(transition: TransitionDto): void { this.transition = transition; this.dialogTextStatus = transition.dialogText as string;