diff --git a/app/Space/EnvironmentManager.php b/app/Space/EnvironmentManager.php index 95a18194..31fcee76 100755 --- a/app/Space/EnvironmentManager.php +++ b/app/Space/EnvironmentManager.php @@ -61,7 +61,7 @@ class EnvironmentManager } catch (Exception $e) { return [ - 'error' => $e->getMessage() + 'error_message' => $e->getMessage() ]; } diff --git a/resources/assets/js/views/wizard/Database.vue b/resources/assets/js/views/wizard/Database.vue index 434f4a0f..71b0bc19 100644 --- a/resources/assets/js/views/wizard/Database.vue +++ b/resources/assets/js/views/wizard/Database.vue @@ -203,8 +203,10 @@ export default { this.$emit('next') window.toastr['success'](this.$t('wizard.success.' + response.data.success)) return true - } else { + } else if (response.data.error) { window.toastr['error'](this.$t('wizard.errors.' + response.data.error)) + } else if (response.data.error_message) { + window.toastr['error'](response.data.error_message) } } catch (e) { window.toastr['error'](e.response.data.message)