Skip to content

Commit c6d7dc0

Browse files
authored
Merge pull request #37 from kingscode/KCI-163
KCI-163 > Fix issue with displaying server-errors and added translations
2 parents 4956b5d + 2a8805e commit c6d7dc0

File tree

4 files changed

+14
-3
lines changed

4 files changed

+14
-3
lines changed
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
export default {
22
save: 'Opslaan',
3+
close: 'Sluiten',
34
from: 'van',
45
till: 'tot',
6+
of: 'van',
57
create: 'Nieuwe maken',
68
update: 'Wijzigen',
79
delete: 'Verwijderen',
10+
cancel: 'Terug',
811
'no-data': 'Er is niets gevonden...',
912
'no-results': 'Er is niets gevonden...',
1013
'rows-per-page-text': 'Rijen per pagina',
@@ -13,5 +16,8 @@ export default {
1316
'snackbar-get-error': 'Er ging iets mis, probeer het later opnieuwr',
1417
'snackbar-deleted': 'Het is verwijderd!',
1518
'snackbar-delete-error': 'Er ging iets mis, probeer het later opnieuw',
16-
'search': 'Zoeken',
19+
search: 'Zoeken',
20+
loading: 'Laden...',
21+
'delete-confirmation-title': 'Weet u het zeker?',
22+
'delete-confirmation-content': 'Weet u het zeker dat u deze item(s) wilt verwijderen?',
1723
};

generator/templates/Crud/src/components/Resource.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ export default {
160160
resolve();
161161
})
162162
.catch((error) => {
163-
this.errors = error.response.data.errors;
163+
this.$refs.createForm.validate();
164164
reject(error);
165165
});
166166
} else {
@@ -180,7 +180,7 @@ export default {
180180
this.updateRequest(this.updateForm.values)
181181
.then(() => resolve())
182182
.catch((error) => {
183-
this.errors = error.response.data.errors;
183+
this.$refs.createForm.validate();
184184
reject(error);
185185
});
186186
} else {

generator/templates/Crud/src/components/VuetifyResourceBaseForm.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,8 @@ export default {
6868
}, 500);
6969
},
7070
},
71+
beforeDestroy() {
72+
clearTimeout(this.emitTimeout);
73+
},
7174
};
7275
</script>

generator/templates/Default/src/components/crud/fields/FieldMixin.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ export default {
7070
getServerError() {
7171
const error = this.$store.getters['error/find'](this.validationField || this.field);
7272
if (error) {
73+
// ServerError should be removed after it had been appeared,
74+
// else the ServerError keep existing and appearing when the user tries to navigate to a different form
7375
this.removeServerError(this.field);
7476
return error;
7577
}

0 commit comments

Comments
 (0)