{i18n('SAVE')}
@@ -482,20 +486,20 @@ class AdminPanelEmailSettings extends React.Component {
path: '/system/get-settings',
data: {allSettings: 1}
}).then(result => this.setState({
- headerImage: result.data['mail-template-header-image'],
+ headerImage: result.data['mail-template-header-image'] || '',
emailForm: {
- ['server-email']: result.data['server-email'],
+ ['server-email']: result.data['server-email'] || '',
},
smtpForm: {
- ['smtp-host']: result.data['smtp-host'],
- ['smtp-user']: result.data['smtp-user'],
+ ['smtp-host']: result.data['smtp-host'] || '',
+ ['smtp-user']: result.data['smtp-user'] || '',
['smtp-pass']: 'HIDDEN',
},
imapForm: {
- ['imap-host']: result.data['imap-host'],
- ['imap-user']: result.data['imap-user'],
+ ['imap-host']: result.data['imap-host'] || '',
+ ['imap-user']: result.data['imap-user'] || '',
['imap-pass']: 'HIDDEN',
- ['imap-token']: result.data['imap-token'],
+ ['imap-token']: result.data['imap-token'] || '',
},
}));
}
diff --git a/client/src/app/admin/panel/staff/admin-panel-departments.js b/client/src/app/admin/panel/staff/admin-panel-departments.js
index 7b8ee5fb..6b71b253 100644
--- a/client/src/app/admin/panel/staff/admin-panel-departments.js
+++ b/client/src/app/admin/panel/staff/admin-panel-departments.js
@@ -204,12 +204,13 @@ class AdminPanelDepartments extends React.Component {
const {
form,
errors,
- formLoading
- } = this.state
+ formLoading,
+ } = this.state;
return {
- values: form,
+ values: {...form, private: !!form.private},
errors: errors,
+ loading: formLoading,
onChange: (form) => {this.setState({form, edited: true})},
onValidateErrors: (errors) => {this.setState({errors})},
onSubmit: this.onFormSubmit.bind(this),
@@ -220,13 +221,15 @@ class AdminPanelDepartments extends React.Component {
getDefaultDepartmentFormProps() {
const {
- formLoading
+ formLoading,
+ defaultDepartment,
+ defaultDepartmentLocked
} = this.state;
return {
values: {
- defaultDepartment: getPublicDepartmentIndexFromDepartmentId(this.state.defaultDepartment),
- locked: this.state.defaultDepartmentLocked,
+ defaultDepartment: getPublicDepartmentIndexFromDepartmentId(defaultDepartment),
+ locked: defaultDepartmentLocked ? true : false,
},
onChange: (formValue) => {
this.setState({
diff --git a/client/src/app/admin/panel/staff/admin-panel-view-staff.js b/client/src/app/admin/panel/staff/admin-panel-view-staff.js
index 69c3f670..ef0c9113 100644
--- a/client/src/app/admin/panel/staff/admin-panel-view-staff.js
+++ b/client/src/app/admin/panel/staff/admin-panel-view-staff.js
@@ -32,7 +32,14 @@ class AdminPanelViewStaff extends React.Component {
}
getProps() {
- return _.extend({}, this.state.userData, {
+ const { userData } = this.state;
+ const userDataWithNumericLevel = {
+ ...userData,
+ level: userData.level*1,
+ sendEmailOnNewTicket: userData.sendEmailOnNewTicket === "1"
+ };
+
+ return _.extend({}, userDataWithNumericLevel, {
staffId: this.props.params.staffId * 1,
onDelete: this.onDelete.bind(this),
onChange: this.retrieveStaff.bind(this)
diff --git a/client/src/app/admin/panel/tickets/admin-panel-custom-tags.js b/client/src/app/admin/panel/tickets/admin-panel-custom-tags.js
deleted file mode 100644
index 79676a70..00000000
--- a/client/src/app/admin/panel/tickets/admin-panel-custom-tags.js
+++ /dev/null
@@ -1,96 +0,0 @@
-import React from 'react';
-import {connect} from 'react-redux';
-
-import AdminPanelCustomTagsModal from 'app/admin/panel/tickets/admin-panel-custom-tags-modal';
-
-import i18n from 'lib-app/i18n';
-import API from 'lib-app/api-call';
-import ConfigActions from 'actions/config-actions';
-
-import AreYouSure from 'app-components/are-you-sure';
-import ModalContainer from 'app-components/modal-container';
-
-import Icon from 'core-components/icon';
-import Button from 'core-components/button';
-import Header from 'core-components/header';
-import Tag from 'core-components/tag';
-
-class AdminPanelCustomTags extends React.Component {
- static propTypes = {
- tags: React.PropTypes.arrayOf(
- React.PropTypes.shape({
- name: React.PropTypes.string,
- color: React.PropTypes.string,
- id: React.PropTypes.number
- })
- ),
- };
-
- componentDidMount() {
- this.retrieveCustomTags();
- }
-
- render() {
- return (
-
-
- {this.renderContent()}
-
- );
- }
-
- renderContent() {
- return (
-
-
-
-
-
- {this.props.tags.map(this.renderTag.bind(this))}
-
-
- );
- }
-
- renderTag(tag, index) {
- return (
-
-
-
- )
- }
-
- openTagModal() {
- ModalContainer.openModal(
-
- );
- }
-
- onDeleteClick(tagId, event) {
- event.preventDefault();
- AreYouSure.openModal(i18n('WILL_DELETE_CUSTOM_RESPONSE'), this.deleteCustomTag.bind(this, tagId));
- }
-
- deleteCustomTag(tagId) {
- API.call({
- path: '/ticket/delete-tag',
- data: {
- tagId,
- }
- }).then(() => {
- this.retrieveCustomTags()
- });
- }
-
- retrieveCustomTags() {
- this.props.dispatch(ConfigActions.updateData());
- }
-}
-
-export default connect((store) => {
- return {
- tags: store.config['tags']
- };
-})(AdminPanelCustomTags);
diff --git a/client/src/app/admin/panel/tickets/admin-panel-custom-tags.scss b/client/src/app/admin/panel/tickets/admin-panel-custom-tags.scss
deleted file mode 100644
index d8d8b51c..00000000
--- a/client/src/app/admin/panel/tickets/admin-panel-custom-tags.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-.admin-panel-custom-tags {
-
- &__content {
- text-align: left;
- }
-
- &__add-button-icon{
- margin-left: 5px;
- }
-
- &__tag-list{
- margin-top: 15px;
- }
-
- &__tag-container{
- margin-top:5px ;
- }
-}
diff --git a/client/src/app/admin/panel/tickets/admin-panel-search-tickets.js b/client/src/app/admin/panel/tickets/admin-panel-search-tickets.js
index ca356ff3..5f27efba 100644
--- a/client/src/app/admin/panel/tickets/admin-panel-search-tickets.js
+++ b/client/src/app/admin/panel/tickets/admin-panel-search-tickets.js
@@ -55,14 +55,14 @@ class AdminPanelSearchTickets extends React.Component {
render() {
const { listConfig } = this.props;
return (
-
-
+
+