diff --git a/client/src/app-components/ticket-viewer.js b/client/src/app-components/ticket-viewer.js
index 182d4718..d45dd4b4 100644
--- a/client/src/app-components/ticket-viewer.js
+++ b/client/src/app-components/ticket-viewer.js
@@ -132,17 +132,6 @@ class TicketViewer extends React.Component {
'high': 'HIGH'
};
- let ownerNode = null;
- if (this.props.assignmentAllowed && _.isEmpty(ticket.owner)) {
- ownerNode = (
-
- );
- } else {
- ownerNode = i18n((ticket.closed) ? 'CLOSED' : 'OPENED');
- }
-
return (
@@ -168,13 +157,29 @@ class TicketViewer extends React.Component {
{(ticket.owner) ? ticket.owner.name : i18n('NONE')}
- {ownerNode}
+ {this.renderOwnerNode()}
);
}
+ renderOwnerNode() {
+ let ownerNode = null;
+
+ if (this.props.assignmentAllowed && _.isEmpty(this.props.ticket.owner)) {
+ ownerNode = (
+
+ );
+ } else {
+ ownerNode = i18n((this.props.closed) ? 'CLOSED' : 'OPENED');
+ }
+
+ return ownerNode;
+ }
+
renderTicketEvent(options, index) {
return (
diff --git a/client/src/data/fixtures/ticket-fixtures.js b/client/src/data/fixtures/ticket-fixtures.js
index 3d64bf2b..5d05e16c 100644
--- a/client/src/data/fixtures/ticket-fixtures.js
+++ b/client/src/data/fixtures/ticket-fixtures.js
@@ -85,19 +85,19 @@ module.exports = [
return {
status: 'success',
data: {
- ticketNumber: '118551',
+ ticketNumber: '878552',
title: 'Lorem ipsum door',
content: 'I had a problem with the installation of the php server',
department: {
id: 1,
name: 'Sales Support'
},
- date: 20150409,
+ date: '20160415',
file: 'http://www.opensupports.com/some_file.zip',
language: 'en',
unread: false,
closed: false,
- priority: 'high',
+ priority: 'medium',
author: {
name: 'Haskell Curry',
email: 'haskell@lambda.com'
@@ -108,7 +108,7 @@ module.exports = [
events: [
{
type: 'ASSIGN',
- date: 20150409,
+ date: '20150409',
author: {
name: 'Emilia Clarke',
email: 'jobs@steve.com',
@@ -118,7 +118,7 @@ module.exports = [
},
{
type: 'COMMENT',
- date: 20150409,
+ date: '20150409',
content: 'Do you have apache installed? It generally happens if you dont have apache.',
author: {
name: 'Emilia Clarke',
@@ -129,7 +129,7 @@ module.exports = [
},
{
type: 'UN_ASSIGN',
- date: 20150410,
+ date: '20150410',
author: {
name: 'Emilia Clarke',
email: 'jobs@steve.com',
@@ -139,7 +139,7 @@ module.exports = [
},
{
type: 'DEPARTMENT_CHANGED',
- date: 20150411,
+ date: '20150411',
content: 'System support',
author: {
name: 'Emilia Clarke',
@@ -150,7 +150,7 @@ module.exports = [
},
{
type: 'COMMENT',
- date: 20150412,
+ date: '20150412',
content: 'I have already installed apache, but the problem persists',
author: {
name: 'Haskell Curry',
@@ -160,7 +160,7 @@ module.exports = [
},
{
type: 'PRIORITY_CHANGED',
- date: 20150413,
+ date: '20150413',
content: 'MEDIUM',
author: {
name: 'Emilia Clarke',
@@ -171,7 +171,7 @@ module.exports = [
},
{
type: 'COMMENT',
- date: 20150511,
+ date: '20150511',
content: 'Thanks!, I soved it by myself',
author: {
name: 'Haskell Curry',
@@ -181,7 +181,7 @@ module.exports = [
},
{
type: 'CLOSE',
- date: 20150513,
+ date: '20150513',
author: {
name: 'Emilia Clarke',
email: 'jobs@steve.com',
@@ -191,7 +191,7 @@ module.exports = [
},
{
type: 'RE_OPEN',
- date: 20151018,
+ date: '20151018',
author: {
name: 'Haskell Curry',
email: 'haskell@lambda.com',