From ae80d91f343f4dd757bf115a31f6a44c56d81cc4 Mon Sep 17 00:00:00 2001 From: kolaente Date: Thu, 23 Nov 2017 15:28:38 +0100 Subject: [PATCH] Fixed error messages --- frontend/src/components/AuthorOverview.vue | 2 +- frontend/src/components/Authors.vue | 2 +- frontend/src/components/AuthorsAddEdit.vue | 2 +- frontend/src/components/BookOverview.vue | 2 +- frontend/src/components/Books.vue | 5 +++- frontend/src/components/BooksAddEdit.vue | 2 +- frontend/src/components/PublisherOverview.vue | 2 +- frontend/src/components/Publishers.vue | 30 +++++++++---------- frontend/src/components/PublishersAddEdit.vue | 2 +- 9 files changed, 25 insertions(+), 24 deletions(-) diff --git a/frontend/src/components/AuthorOverview.vue b/frontend/src/components/AuthorOverview.vue index 5684d04..b208186 100644 --- a/frontend/src/components/AuthorOverview.vue +++ b/frontend/src/components/AuthorOverview.vue @@ -61,7 +61,7 @@ this.loading = false // Build the notification text from error response let err = e.message - if (e.response.data) { + if (e.response.data.Message) { err += '
' + e.response.data.Message } diff --git a/frontend/src/components/Authors.vue b/frontend/src/components/Authors.vue index 8be307f..b5c29cb 100644 --- a/frontend/src/components/Authors.vue +++ b/frontend/src/components/Authors.vue @@ -132,7 +132,7 @@ export default { errorNotification (e) { // Build the notification text from error response let err = e.message - if (e.response.data) { + if (e.response.data.Message) { err += '
' + e.response.data.Message } diff --git a/frontend/src/components/AuthorsAddEdit.vue b/frontend/src/components/AuthorsAddEdit.vue index a1ce65e..53b9e22 100644 --- a/frontend/src/components/AuthorsAddEdit.vue +++ b/frontend/src/components/AuthorsAddEdit.vue @@ -64,7 +64,7 @@ errorNotification (e) { // Build the notification text from error response let err = e.message - if (e.response.data) { + if (e.response.data.Message) { err += '
' + e.response.data.Message } diff --git a/frontend/src/components/BookOverview.vue b/frontend/src/components/BookOverview.vue index 02326f7..a63ad38 100644 --- a/frontend/src/components/BookOverview.vue +++ b/frontend/src/components/BookOverview.vue @@ -78,7 +78,7 @@ errorNotification (e) { // Build the notification text from error response let err = e.message - if (e.response.data) { + if (e.response.data.Message) { err += '
' + e.response.data.Message } diff --git a/frontend/src/components/Books.vue b/frontend/src/components/Books.vue index 3d2a639..09e97e0 100644 --- a/frontend/src/components/Books.vue +++ b/frontend/src/components/Books.vue @@ -148,7 +148,7 @@ export default { errorNotification (e) { // Build the notification text from error response let err = e.message - if (e.response.data) { + if (e.response.data.Message) { err += '
' + e.response.data.Message } @@ -209,6 +209,9 @@ export default { this.allStatus = response.data }) .catch(e => { + if (!e.response.data.Message) { + e.response.data = { Message: 'Could not get Status.' } + } this.errorNotification(e) }) }, diff --git a/frontend/src/components/BooksAddEdit.vue b/frontend/src/components/BooksAddEdit.vue index 5e0e4a5..9d7bc3f 100644 --- a/frontend/src/components/BooksAddEdit.vue +++ b/frontend/src/components/BooksAddEdit.vue @@ -165,7 +165,7 @@ errorNotification (e) { // Build the notification text from error response let err = e.message - if (e.response.data) { + if (e.response.data.Message) { err += '
' + e.response.data.Message } diff --git a/frontend/src/components/PublisherOverview.vue b/frontend/src/components/PublisherOverview.vue index 88e0bcc..0c39088 100644 --- a/frontend/src/components/PublisherOverview.vue +++ b/frontend/src/components/PublisherOverview.vue @@ -56,7 +56,7 @@ this.loading = false // Build the notification text from error response let err = e.message - if (e.response.data) { + if (e.response.data.Message) { err += '
' + e.response.data.Message } diff --git a/frontend/src/components/Publishers.vue b/frontend/src/components/Publishers.vue index a2a0771..5769adb 100644 --- a/frontend/src/components/Publishers.vue +++ b/frontend/src/components/Publishers.vue @@ -108,20 +108,6 @@ export default { '$route': 'loadPublishers' }, computed: { - errorNotification (e) { - // Build the notification text from error response - let err = e.message - if (e.response.data) { - err += '
' + e.response.data.Message - } - - // Fire a notification - this.$notify({ - type: 'error', - title: this.langGeneral.error, - text: err - }) - }, filteredData: function () { var filterKey = this.searchQuery && this.searchQuery.toLowerCase() var data = this.publishers @@ -143,6 +129,20 @@ export default { } }, methods: { + errorNotification (e) { + // Build the notification text from error response + let err = e.message + if (e.response.data.Message) { + err += '
' + e.response.data.Message + } + + // Fire a notification + this.$notify({ + type: 'error', + title: this.langGeneral.error, + text: err + }) + }, loadPublishers () { this.loading = true this.publishers = [] @@ -177,10 +177,8 @@ export default { DeletePublisher (obj) { this.showModal = true this.$on('delete-submit', function () { - console.log(obj) HTTP.delete('publishers/' + obj.ID.content) .then(response => { - console.log(response) if (response.status === 200 && response.data.Message === 'success') { // Fire a notification this.$notify({ diff --git a/frontend/src/components/PublishersAddEdit.vue b/frontend/src/components/PublishersAddEdit.vue index fe02351..b45dcde 100644 --- a/frontend/src/components/PublishersAddEdit.vue +++ b/frontend/src/components/PublishersAddEdit.vue @@ -57,7 +57,7 @@ errorNotification (e) { // Build the notification text from error response let err = e.message - if (e.response.data) { + if (e.response.data.Message) { err += '
' + e.response.data.Message }