Skip to content

Commit a2ab70c

Browse files
authored
Merge pull request #6048 from simfeld/fix/material-list-delete-error
fix: error message when deleting material list
2 parents 3938401 + a7057ab commit a2ab70c

File tree

6 files changed

+19
-25
lines changed

6 files changed

+19
-25
lines changed

frontend/src/components/campAdmin/DialogMaterialListEdit.vue

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<PromptEntityDelete
1717
:entity="entityUri"
1818
:warning-text-entity="materialList.name"
19+
:error-handler="deleteErrorHandler"
1920
position="top"
2021
align="left"
2122
/>
@@ -50,6 +51,14 @@ export default {
5051
}
5152
},
5253
},
54+
methods: {
55+
deleteErrorHandler(e) {
56+
if (e?.response?.status === 422 /* Validation Error */) {
57+
return this.$tc('components.campAdmin.dialogMaterialListEdit.deleteError')
58+
}
59+
return null
60+
},
61+
},
5362
}
5463
</script>
5564

frontend/src/locales/de.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,6 @@
9393
"createMaterialList": "Materialliste erstellen",
9494
"title": "Materiallisten"
9595
},
96-
"campMaterialListsItem": {
97-
"deleteError": "Materialliste konnte nicht gelöscht werden. Überprüfe vor dem Löschen, dass die Liste leer ist.",
98-
"deleteWarning": "Möchtest du diese Materialliste wirklich löschen?"
99-
},
10096
"campPeriods": {
10197
"createPeriod": "Lagerabschnitt erstellen",
10298
"title": "Lagerabschnitt | Lagerabschnitte"
@@ -135,7 +131,8 @@
135131
"title": "Materialliste erstellen"
136132
},
137133
"dialogMaterialListEdit": {
138-
"title": "Materialliste bearbeiten"
134+
"title": "Materialliste bearbeiten",
135+
"deleteError": "Materialliste konnte nicht gelöscht werden. Überprüfe vor dem Löschen, dass die Liste leer ist."
139136
},
140137
"dialogPeriodCreate": {
141138
"title": "Lagerabschnitt erstellen"

frontend/src/locales/en.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,6 @@
9393
"createMaterialList": "Create material list",
9494
"title": "Material lists"
9595
},
96-
"campMaterialListsItem": {
97-
"deleteError": "Could not delete the material list. Check if the list is empty before deleting it.",
98-
"deleteWarning": "Do you really want to delete this material list?"
99-
},
10096
"campPeriods": {
10197
"createPeriod": "Create period",
10298
"title": "Period | Periods"
@@ -135,7 +131,8 @@
135131
"title": "Create material list"
136132
},
137133
"dialogMaterialListEdit": {
138-
"title": "Edit material list"
134+
"title": "Edit material list",
135+
"deleteError": "Could not delete the material list. Check if the list is empty before deleting it."
139136
},
140137
"dialogPeriodCreate": {
141138
"title": "Create period"

frontend/src/locales/fr.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,6 @@
8989
"createMaterialList": "Créer une liste de matériel",
9090
"title": "Listes de matériel"
9191
},
92-
"campMaterialListsItem": {
93-
"deleteError": "Impossible de supprimer la liste de matériel. Vérifie que la liste soit vide avant de la supprimer.",
94-
"deleteWarning": "Veux-tu vraiment supprimer cette liste de matériel ?"
95-
},
9692
"campPeriods": {
9793
"createPeriod": "Créer une période",
9894
"title": "Période | Périodes"
@@ -124,7 +120,8 @@
124120
"title": "Créer une liste de matériel"
125121
},
126122
"dialogMaterialListEdit": {
127-
"title": "Modifier la liste de matériel"
123+
"title": "Modifier la liste de matériel",
124+
"deleteError": "Impossible de supprimer la liste de matériel. Vérifie que la liste soit vide avant de la supprimer."
128125
},
129126
"dialogPeriodCreate": {
130127
"title": "Créer une période"

frontend/src/locales/it.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@
8181
"createMaterialList": "Crea l'elenco dei materiali",
8282
"title": "Elenchi di materiali"
8383
},
84-
"campMaterialListsItem": {
85-
"deleteError": "Impossibile eliminare l'elenco dei materiali. Controlla che l'elenco sia vuoto prima di eliminarlo.",
86-
"deleteWarning": "Vuoi davvero cancellare questo elenco di materiali?"
87-
},
8884
"campPeriods": {
8985
"createPeriod": "Creare il periodo",
9086
"title": "Periodo | Periodi"
@@ -116,7 +112,8 @@
116112
"title": "Crea l'elenco dei materiali"
117113
},
118114
"dialogMaterialListEdit": {
119-
"title": "Modifica elenco materiali"
115+
"title": "Modifica elenco materiali",
116+
"deleteError": "Impossibile eliminare l'elenco dei materiali. Controlla che l'elenco sia vuoto prima di eliminarlo."
120117
},
121118
"dialogPeriodCreate": {
122119
"title": "Creare il periodo"

frontend/src/locales/rm.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,6 @@
7474
"createMaterialList": "Crear ina glista da material",
7575
"title": "Glistas da material"
7676
},
77-
"campMaterialListsItem": {
78-
"deleteError": "Impussibel da stizzar la glista da material. Verifitgescha che la glista è vida avant che stizzar.",
79-
"deleteWarning": "Vuls ti propi stizzar questa glista da material?"
80-
},
8177
"campPeriods": {
8278
"createPeriod": "Crear ina part dal champ",
8379
"title": "Part dal champ | Parts dal champ"
@@ -109,7 +105,8 @@
109105
"title": "Crear ina glista da material"
110106
},
111107
"dialogMaterialListEdit": {
112-
"title": "Modifitgar la glista da material"
108+
"title": "Modifitgar la glista da material",
109+
"deleteError": "Impussibel da stizzar la glista da material. Verifitgescha che la glista è vida avant che stizzar."
113110
},
114111
"dialogPeriodCreate": {
115112
"title": "Craer ina part dal champ"

0 commit comments

Comments
 (0)