diff --git a/client/src/app-components/__tests__/ticket-list-test.js b/client/src/app-components/__tests__/ticket-list-test.js index 333229a7..a9072e2d 100644 --- a/client/src/app-components/__tests__/ticket-list-test.js +++ b/client/src/app-components/__tests__/ticket-list-test.js @@ -12,7 +12,14 @@ const TicketList = requireUnit('app-components/ticket-list', { 'core-components/button': Button, 'core-components/tooltip': Tooltip, 'app-components/department-dropdown': DepartmentDropdown, - 'lib-app/i18n': i18n + 'lib-app/i18n': i18n, + 'react-redux': { + connect: function() { + return function(param) { + return param; + } + } + }, }); describe('TicketList component', function () { @@ -32,7 +39,8 @@ describe('TicketList component', function () { author: { id: 3, name: 'Francisco Villegas' - } + }, + tags: [] }; let list = _.range(5).map(() => ticket); diff --git a/client/src/app-components/ticket-event.js b/client/src/app-components/ticket-event.js index ebab5f20..ba6fa9e5 100644 --- a/client/src/app-components/ticket-event.js +++ b/client/src/app-components/ticket-event.js @@ -80,6 +80,9 @@ class TicketEvent extends React.Component { } renderComment() { + const {author} = this.props.author; + const customFields = (author && author.customfields) || []; + return (
@@ -88,7 +91,7 @@ class TicketEvent extends React.Component { {i18n((this.props.author.staff) ? 'STAFF' : 'CUSTOMER')} - {this.props.author.customfields.map(this.renderCustomFieldValue.bind(this))} + {customFields.map(this.renderCustomFieldValue.bind(this))} {(this.props.private*1) ? this.renderPrivateBadge() : null}
{DateTransformer.transformToString(this.props.date)}
diff --git a/client/src/app-components/ticket-list.js b/client/src/app-components/ticket-list.js index 1ce96238..4024ba51 100644 --- a/client/src/app-components/ticket-list.js +++ b/client/src/app-components/ticket-list.js @@ -1,6 +1,6 @@ import React from 'react'; import _ from 'lodash'; -import {connect} from "react-redux"; +import {connect} from 'react-redux'; import i18n from 'lib-app/i18n'; import DateTransformer from 'lib-core/date-transformer'; @@ -10,7 +10,6 @@ import DepartmentDropdown from 'app-components/department-dropdown'; import Table from 'core-components/table'; import Button from 'core-components/button'; import Tooltip from 'core-components/tooltip'; -import Icon from 'core-components/icon'; import Checkbox from 'core-components/checkbox'; import Tag from 'core-components/tag'; diff --git a/client/src/app-components/ticket-viewer.js b/client/src/app-components/ticket-viewer.js index 87012c71..fd724874 100644 --- a/client/src/app-components/ticket-viewer.js +++ b/client/src/app-components/ticket-viewer.js @@ -11,7 +11,6 @@ import MentionsParser from 'lib-app/mentions-parser'; import TicketEvent from 'app-components/ticket-event'; import AreYouSure from 'app-components/are-you-sure'; -import DateTransformer from 'lib-core/date-transformer'; import Form from 'core-components/form'; import FormField from 'core-components/form-field'; import SubmitButton from 'core-components/submit-button'; @@ -67,7 +66,6 @@ class TicketViewer extends React.Component { render() { const ticket = this.props.ticket; - console.log('tickett',ticket) return (
diff --git a/client/src/app/admin/panel/users/admin-panel-custom-fields.js b/client/src/app/admin/panel/users/admin-panel-custom-fields.js index 0b342289..c93b0195 100644 --- a/client/src/app/admin/panel/users/admin-panel-custom-fields.js +++ b/client/src/app/admin/panel/users/admin-panel-custom-fields.js @@ -43,9 +43,9 @@ class AdminPanelCustomFields extends React.Component {