tyler.durden/opensupports
1
0
Fork 0
mirror of https://github.com/opensupports/opensupports.git synced 2025-04-08 18:35:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Max - makes second paremeter of DateTransformer.transformToString optional [skip ci]

Browse Source
This commit is contained in:
Max Red 2016-12-13 20:33:58 -03:00
parent 0dff819838
commit 5dd9ae10a9
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app-components/people-list.js
View File

@ -93,7 +93,7 @@ class PeopleList extends React.Component {
</div>
<div className="people-list__item-block people-list__item-last-login">
<div>{i18n('LAST_LOGIN')}</div>
<div>{DateTransformer.transformToString(item.lastLogin, true)}</div>
<div>{DateTransformer.transformToString(item.lastLogin)}</div>
</div>
</div>
) : null;

16
client/src/app-components/ticket-event.js
View File

@ -24,7 +24,7 @@ class TicketEvent extends React.Component {
render() {
let iconNode = null;
if (this.props.type === 'COMMENT' && this.props.author && this.props.author.staff) {
iconNode = this.renderStaffPic();
} else {
@ -82,7 +82,7 @@ class TicketEvent extends React.Component {
<span className="ticket-event__comment-author-name">{this.props.author.name}</span>
<span className="ticket-event__comment-author-type">({i18n((this.props.author.staff) ? 'STAFF' : 'CUSTOMER')})</span>
</div>
<div className="ticket-event__comment-date">{DateTransformer.transformToString(this.props.date, true)}</div>
<div className="ticket-event__comment-date">{DateTransformer.transformToString(this.props.date)}</div>
<div className="ticket-event__comment-content" dangerouslySetInnerHTML={{__html: this.props.content}}></div>
{this.renderFileRow(this.props.file)}
</div>
@ -94,7 +94,7 @@ class TicketEvent extends React.Component {
<div className="ticket-event__circled">
<span className="ticket-event__circled-author">{this.props.author.name}</span>
<span className="ticket-event__circled-text"> assigned this ticket</span>
<span className="ticket-event__circled-date"> on {DateTransformer.transformToString(this.props.date, true)}</span>
<span className="ticket-event__circled-date"> on {DateTransformer.transformToString(this.props.date)}</span>
</div>
)
}
@ -104,7 +104,7 @@ class TicketEvent extends React.Component {
<div className="ticket-event__circled">
<span className="ticket-event__circled-author">{this.props.author.name}</span>
<span className="ticket-event__circled-text"> unassigned this ticket</span>
<span className="ticket-event__circled-date"> on {DateTransformer.transformToString(this.props.date, true)}</span>
<span className="ticket-event__circled-date"> on {DateTransformer.transformToString(this.props.date)}</span>
</div>
)
}
@ -114,7 +114,7 @@ class TicketEvent extends React.Component {
<div className="ticket-event__circled">
<span className="ticket-event__circled-author">{this.props.author.name}</span>
<span className="ticket-event__circled-text"> closed this ticket</span>
<span className="ticket-event__circled-date"> on {DateTransformer.transformToString(this.props.date, true)}</span>
<span className="ticket-event__circled-date"> on {DateTransformer.transformToString(this.props.date)}</span>
</div>
)
}
@ -124,7 +124,7 @@ class TicketEvent extends React.Component {
<div className="ticket-event__circled">
<span className="ticket-event__circled-author">{this.props.author.name}</span>
<span className="ticket-event__circled-text"> reopen this ticket</span>
<span className="ticket-event__circled-date"> on {DateTransformer.transformToString(this.props.date, true)}</span>
<span className="ticket-event__circled-date"> on {DateTransformer.transformToString(this.props.date)}</span>
</div>
);
}
@ -135,7 +135,7 @@ class TicketEvent extends React.Component {
<span className="ticket-event__circled-author">{this.props.author.name}</span>
<span className="ticket-event__circled-text"> change department to</span>
<span className="ticket-event__circled-indication"> {this.props.content}</span>
<span className="ticket-event__circled-date"> on {DateTransformer.transformToString(this.props.date, true)}</span>
<span className="ticket-event__circled-date"> on {DateTransformer.transformToString(this.props.date)}</span>
</div>
);
}
@ -146,7 +146,7 @@ class TicketEvent extends React.Component {
<span className="ticket-event__circled-author">{this.props.author.name}</span>
<span className="ticket-event__circled-text"> change priority to</span>
<span className="ticket-event__circled-indication"> {this.props.content}</span>
<span className="ticket-event__circled-date"> on {DateTransformer.transformToString(this.props.date, true)}</span>
<span className="ticket-event__circled-date"> on {DateTransformer.transformToString(this.props.date)}</span>
</div>
);
}

2
client/src/app-components/ticket-viewer.js
View File

@ -89,7 +89,7 @@ class TicketViewer extends React.Component {
onChange={this.onDepartmentDropdownChanged.bind(this)} />
</div>
<div className="col-md-4">{ticket.author.name}</div>
<div className="col-md-4">{DateTransformer.transformToString(ticket.date, true)}</div>
<div className="col-md-4">{DateTransformer.transformToString(ticket.date)}</div>
</div>
<div className="ticket-viewer__info-row-header row">
<div className="col-md-4">{i18n('PRIORITY')}</div>

2
client/src/app/admin/panel/articles/admin-panel-view-article.js
View File

@ -72,7 +72,7 @@ class AdminPanelViewArticle extends React.Component {
<div dangerouslySetInnerHTML={{__html: article.content}}/>
</div>
<div className="admin-panel-view-article__last-edited">
{i18n('LAST_EDITED_IN', {date: DateTransformer.transformToString(article.lastEdited, true)})}
{i18n('LAST_EDITED_IN', {date: DateTransformer.transformToString(article.lastEdited)})}
</div>
</div>
</div>

2
client/src/app/main/dashboard/dashboard-article/dashboard-article-page.js
View File

@ -57,7 +57,7 @@ class DashboardArticlePage extends React.Component {
<div dangerouslySetInnerHTML={{__html: article.content}}/>
</div>
<div className="dashboard-article-page__last-edited">
{i18n('LAST_EDITED_IN', {date: DateTransformer.transformToString(article.lastEdited, true)})}
{i18n('LAST_EDITED_IN', {date: DateTransformer.transformToString(article.lastEdited)})}
</div>
</div>
);

2
client/src/lib-core/date-transformer.js
View File

@ -1,7 +1,7 @@
let month = ["", "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
export default {
transformToString(date, expressive) {
transformToString(date, expressive = true) {
date += ''; // Transform to string
let y = date.substring(0, 4);
let m = date.substring(4, 6);