Internal: Fix [object Object] js error when page returns 500

pull/3706/head
Julio Montoya 5 years ago
parent 18ec7b3c90
commit ece8e765f4
  1. 38
      assets/vue/App.vue
  2. 2
      assets/vue/mixins/NotificationMixin.js

@ -53,9 +53,7 @@ import {mapGetters} from 'vuex';
import NotificationMixin from './mixins/NotificationMixin'; import NotificationMixin from './mixins/NotificationMixin';
import Breadcrumb from './components/Breadcrumb'; import Breadcrumb from './components/Breadcrumb';
import Snackbar from './components/Snackbar';
import axios from "axios"; import axios from "axios";
import Header from "./components/layout/Header"; import Header from "./components/layout/Header";
import Sidebar from "./components/layout/Sidebar"; import Sidebar from "./components/layout/Sidebar";
import Footer from "./components/layout/Footer"; import Footer from "./components/layout/Footer";
@ -67,9 +65,7 @@ export default {
Sidebar, Sidebar,
Footer, Footer,
Breadcrumb, Breadcrumb,
Snackbar
}, },
mixins: [NotificationMixin], mixins: [NotificationMixin],
data: () => ({ data: () => ({
drawer: true, drawer: true,
@ -111,22 +107,6 @@ export default {
.then((response) => { .then((response) => {
// handle success // handle success
this.$data.legacy_content = response.data; this.$data.legacy_content = response.data;
})
.catch(function (error) {
if (error.response) {
// Request made and server responded
this.showMessage(error.response.data.detail);
console.log(error.response.data);
console.log(error.response.status);
console.log(error.response.headers);
} else if (error.request) {
// The request was made but no response was received
console.log(error.request);
} else {
// Something happened in setting up the request that triggered an Error
console.log('Error', error.message);
}
}); });
} }
}, },
@ -146,7 +126,6 @@ export default {
}, },
created() { created() {
this.$data.legacy_content = ''; this.$data.legacy_content = '';
let isAuthenticated = false; let isAuthenticated = false;
if (this.$parent.$el.attributes["data-is-authenticated"].value) { if (this.$parent.$el.attributes["data-is-authenticated"].value) {
isAuthenticated = JSON.parse(this.$parent.$el.attributes["data-is-authenticated"].value); isAuthenticated = JSON.parse(this.$parent.$el.attributes["data-is-authenticated"].value);
@ -158,7 +137,6 @@ export default {
} }
let payload = {isAuthenticated: isAuthenticated, user: user}; let payload = {isAuthenticated: isAuthenticated, user: user};
this.$store.dispatch("security/onRefresh", payload); this.$store.dispatch("security/onRefresh", payload);
if (this.$parent.$el.attributes["data-flashes"]) { if (this.$parent.$el.attributes["data-flashes"]) {
let flashes = JSON.parse(this.$parent.$el.attributes["data-flashes"].value); let flashes = JSON.parse(this.$parent.$el.attributes["data-flashes"].value);
@ -175,17 +153,19 @@ export default {
this.breadcrumb = JSON.parse(this.$parent.$el.attributes["data-breadcrumb"].value); this.breadcrumb = JSON.parse(this.$parent.$el.attributes["data-breadcrumb"].value);
} }
axios.interceptors.response.use(undefined, (err) => { axios.interceptors.response.use(undefined, (error) => {
return new Promise(() => { return new Promise(() => {
if (err.response.status === 401) { // Unauthorized.
if (401 === error.response.status) {
// Redirect to the login if status 401. // Redirect to the login if status 401.
this.$router.push({path: "/login"}).catch(()=>{}); this.$router.push({path: "/login"}).catch(()=>{});
} else if (err.response.status === 500) { } else if (500 === error.response.status) {
document.open(); if (error.response) {
document.write(err.response.data); // Request made and server responded
document.close(); this.showMessage(error.response.data.detail, 'warning');
}
} }
throw err; return Promise.reject(error);
}); });
}); });
}, },

@ -13,7 +13,7 @@ export default {
);*/ );*/
}, },
showError(error) { showError(error) {
//this.showMessage(error, 'danger'); this.showMessage(error, 'danger');
}, },
showMessage(message, type = 'success') { showMessage(message, type = 'success') {
const content = { const content = {

Loading…
Cancel
Save