tyler.durden/opensupports
1
0
Fork 0
mirror of https://github.com/opensupports/opensupports.git synced 2025-07-29 16:54:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add reopen option after a ticket is closed (#1041)

Browse Source
This commit is contained in:
Joel Elias Méndez 2021-10-10 15:42:36 -03:00 committed by GitHub
parent c64f1f1ea6
commit 0f976ebde9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,6 +83,7 @@ class TicketViewer extends React.Component {
render() { render() {
const { ticket, userStaff, userId, editable, allowAttachments, assignmentAllowed } = this.props; const { ticket, userStaff, userId, editable, allowAttachments, assignmentAllowed } = this.props;
const showResponseField = (!ticket.closed && (editable || !assignmentAllowed));
return ( return (
<div className="ticket-viewer"> <div className="ticket-viewer">
@ -107,7 +108,14 @@ class TicketViewer extends React.Component {
<div className="ticket-viewer__comments"> <div className="ticket-viewer__comments">
{ticket.events && ticket.events.map(this.renderTicketEvent.bind(this))} {ticket.events && ticket.events.map(this.renderTicketEvent.bind(this))}
</div> </div>
{(!ticket.closed && (editable || !assignmentAllowed)) ? this.renderResponseField() : (this.showDeleteButton()) ? this.renderDeleteTicketButton() : null} <div className="ticket-viewer__reopen-closeticket-buttons">
{!showResponseField ? this.renderReopenTicketButton() : null}
{
showResponseField ?
this.renderResponseField() :
(this.showDeleteButton()) ? this.renderDeleteTicketButton() : null
}
</div>
</div> </div>
); );
} }
@ -247,15 +255,19 @@ class TicketViewer extends React.Component {
return ( return (
<div className="ticket-viewer__edit-status__buttons"> <div className="ticket-viewer__edit-status__buttons">
{this.renderCancelButton("Status")} {this.renderCancelButton("Status")}
{this.props.ticket.closed ? {this.props.ticket.closed ? this.renderReopenTicketButton() : this.renderCloseTicketButton()}
<Button type='secondary' size="medium" onClick={this.onReopenClick.bind(this)}>
{i18n('RE_OPEN')}
</Button> :
this.renderCloseTicketButton()}
</div> </div>
); );
} }
renderReopenTicketButton() {
return (
<Button type='secondary' size="medium" onClick={this.onReopenClick.bind(this)}>
{i18n('RE_OPEN')}
</Button>
);
}
renderHeaders() { renderHeaders() {
const ticket = this.props.ticket; const ticket = this.props.ticket;

11
client/src/app-components/ticket-viewer.scss
View File

@ -168,6 +168,13 @@
position: relative; position: relative;
} }
&__reopen-closeticket-buttons {
width: 230px;
display: flex;
justify-content: space-between;
align-content: center;
}
&__response { &__response {
margin-top: 20px; margin-top: 20px;
position: relative; position: relative;
@ -215,8 +222,8 @@
} }
&__delete-button { // &__delete-button {
} // }
@media screen and (max-width: 1151px) { @media screen and (max-width: 1151px) {
.ticket-viewer__info { .ticket-viewer__info {