diff --git a/client/src/app/admin/panel/tickets/admin-panel-custom-responses.js b/client/src/app/admin/panel/tickets/admin-panel-custom-responses.js index 2b9966bf..423b9c43 100644 --- a/client/src/app/admin/panel/tickets/admin-panel-custom-responses.js +++ b/client/src/app/admin/panel/tickets/admin-panel-custom-responses.js @@ -14,6 +14,7 @@ import Button from 'core-components/button'; import Header from 'core-components/header'; import Listing from 'core-components/listing'; import Loading from 'core-components/loading'; +import Message from 'core-components/message'; import Form from 'core-components/form'; import FormField from 'core-components/form-field'; import SubmitButton from 'core-components/submit-button'; @@ -30,6 +31,7 @@ class AdminPanelCustomResponses extends React.Component { formLoading: false, selectedIndex: -1, errors: {}, + error:'', originalForm: { title: '', content: TextEditor.createEmpty(), @@ -88,18 +90,23 @@ class AdminPanelCustomResponses extends React.Component { - +
{(this.state.selectedIndex !== -1) ? this.renderOptionalButtons() : null}
{i18n('SAVE')}
+ {this.state.error ? this.renderErrorMessage() : null} ); } - + renderErrorMessage() { + return( + {i18n(this.state.error)} + ) + } renderOptionalButtons() { return (
@@ -190,9 +197,13 @@ class AdminPanelCustomResponses extends React.Component { language: _.includes(allowedLanguages, form.language) ? form.language : allowedLanguages[0] } }).then(() => { + this.setState({error: ''}); this.retrieveCustomResponses(); this.onItemChange(-1); - }).catch(this.onItemChange.bind(this, -1)); + }).catch((e) => { + this.onItemChange.bind(this, -1) + this.setState({error: e.message, formLoading:false}); + }); } } diff --git a/client/src/app/admin/panel/tickets/admin-panel-custom-responses.scss b/client/src/app/admin/panel/tickets/admin-panel-custom-responses.scss index ff07c036..6b35ebdf 100644 --- a/client/src/app/admin/panel/tickets/admin-panel-custom-responses.scss +++ b/client/src/app/admin/panel/tickets/admin-panel-custom-responses.scss @@ -7,6 +7,11 @@ float: right; } + &__message { + margin-top: 10px; + text-align: center; + } + &__actions, &__optional-buttons { display: flex; diff --git a/server/controllers/ticket/add-custom-response.php b/server/controllers/ticket/add-custom-response.php index 0495d5bd..ad7ca5b2 100755 --- a/server/controllers/ticket/add-custom-response.php +++ b/server/controllers/ticket/add-custom-response.php @@ -37,7 +37,7 @@ class AddCustomResponseController extends Controller { 'requestData' => [ 'name' => [ 'validation' => DataValidator::notBlank()->length(5, 100), - 'error' => ERRORS::INVALID_NAME + 'error' => ERRORS::INVALID_TITLE ], 'content' => [ 'validation' => DataValidator::content(),