Merge pull request #218 from ivandiazwm/master
Fix react editor, email links, smtp password being deleted
This commit is contained in:
Guillermo Giuliana
GitHub
commit
5f07b85975
|
|
@ -69,7 +69,7 @@
|
|||
"react-chartjs-2": "^2.0.0",
|
||||
"react-document-title": "^1.0.2",
|
||||
"react-dom": "^15.4.2",
|
||||
"react-draft-wysiwyg": "^1.7.6",
|
||||
"react-draft-wysiwyg": "^1.12.13",
|
||||
"react-google-recaptcha": "^0.5.2",
|
||||
"react-motion": "^0.4.7",
|
||||
"react-redux": "^4.4.5",
|
||||
|
|
|
|||
|
|
@ -25,7 +25,8 @@ class AdminPanelSystemPreferences extends React.Component {
|
|||
loading: true,
|
||||
message: null,
|
||||
values: {
|
||||
maintenance: false
|
||||
maintenance: false,
|
||||
'smtp-pass': 'HIDDEN',
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -73,7 +74,7 @@ class AdminPanelSystemPreferences extends React.Component {
|
|||
<div className="row">
|
||||
<div className="col-md-9">
|
||||
<FormField label={i18n('SMTP_SERVER')} fieldProps={{size: 'large'}} name="smtp-host"/>
|
||||
<FormField label={i18n('SMTP_PASSWORD')} fieldProps={{size: 'large', password: true}} name="smtp-pass"/>
|
||||
<FormField label={i18n('SMTP_PASSWORD')} fieldProps={{size: 'large'}} name="smtp-pass"/>
|
||||
</div>
|
||||
<div className="col-md-3">
|
||||
<FormField label={i18n('PORT')} fieldProps={{size: 'auto'}} name="smtp-port"/>
|
||||
|
|
@ -173,7 +174,7 @@ class AdminPanelSystemPreferences extends React.Component {
|
|||
'smtp-host': form['smtp-host'],
|
||||
'smtp-port': form['smtp-port'],
|
||||
'smtp-user': form['smtp-user'],
|
||||
'smtp-pass': form['smtp-pass'],
|
||||
[ form['smtp-pass'] !== 'HIDDEN' ? 'smtp-pass' : null]: form['smtp-pass'],
|
||||
'maintenance-mode': form['maintenance-mode'] * 1,
|
||||
'allow-attachments': form['allow-attachments'] * 1,
|
||||
'max-size': form['max-size'],
|
||||
|
|
@ -219,7 +220,7 @@ class AdminPanelSystemPreferences extends React.Component {
|
|||
'smtp-host': result.data['smtp-host'],
|
||||
'smtp-port': result.data['smtp-port'],
|
||||
'smtp-user': result.data['smtp-user'],
|
||||
'smtp-pass': '',
|
||||
'smtp-pass': 'HIDDEN',
|
||||
'maintenance-mode': !!(result.data['maintenance-mode'] * 1),
|
||||
'allow-attachments': !!(result.data['allow-attachments'] * 1),
|
||||
'max-size': result.data['max-size'],
|
||||
|
|
@ -236,7 +237,7 @@ class AdminPanelSystemPreferences extends React.Component {
|
|||
message: 'error'
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
onDiscardChangesSubmit(event) {
|
||||
event.preventDefault();
|
||||
this.setState({loading: true});
|
||||
|
|
@ -244,4 +245,4 @@ class AdminPanelSystemPreferences extends React.Component {
|
|||
}
|
||||
}
|
||||
|
||||
export default AdminPanelSystemPreferences;
|
||||
export default AdminPanelSystemPreferences;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -17,8 +17,8 @@
|
|||
* @apiUse NO_PERMISSION
|
||||
* @apiUse INVALID_PASSWORD
|
||||
* @apiUse SYSTEM_USER_IS_ALREADY_DISABLED
|
||||
*
|
||||
* @apiSuccess {Object} data Empty object
|
||||
*
|
||||
* @apiSuccess {Object} data Empty object
|
||||
*
|
||||
*/
|
||||
|
||||
|
|
@ -53,12 +53,12 @@ class DisableUserSystemController extends Controller {
|
|||
|
||||
foreach($userList as $user) {
|
||||
$ticketNumberList = '';
|
||||
|
||||
|
||||
foreach($user->sharedTicketList as $ticket) {
|
||||
$ticket->authorEmail = $user->email;
|
||||
$ticket->authorName = $user->name;
|
||||
$ticket->author = null;
|
||||
|
||||
|
||||
$ticketNumberList .= $ticket->ticketNumber . ' - ' . $ticket->title . '<br />';
|
||||
$ticket->store();
|
||||
}
|
||||
|
|
@ -68,14 +68,15 @@ class DisableUserSystemController extends Controller {
|
|||
$mailSender->setTemplate(MailTemplate::USER_SYSTEM_DISABLED, [
|
||||
'to' => $user->email,
|
||||
'name' => $user->name,
|
||||
'tickets' => $ticketNumberList
|
||||
'tickets' => $ticketNumberList,
|
||||
'url' => Setting::getSetting('url')->getValue()
|
||||
]);
|
||||
|
||||
$mailSender->send();
|
||||
|
||||
|
||||
$user->delete();
|
||||
}
|
||||
|
||||
|
||||
Response::respondSuccess();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -91,7 +91,8 @@ class EnableUserSystemController extends Controller {
|
|||
$mailSender->setTemplate(MailTemplate::USER_SYSTEM_ENABLED, [
|
||||
'to' => $email,
|
||||
'name' => $name,
|
||||
'password' => $password
|
||||
'password' => $password,
|
||||
'url' => Setting::getSetting('url')->getValue(),
|
||||
]);
|
||||
$mailSender->send();
|
||||
|
||||
|
|
|
|||
|
|
@ -44,11 +44,11 @@ class TestSMTPController extends Controller {
|
|||
Controller::request('smtp-password'),
|
||||
Controller::request('no-reply-email')
|
||||
);
|
||||
|
||||
|
||||
if($mailSender->isConnected()) {
|
||||
Response::respondSuccess();
|
||||
} else {
|
||||
throw new Exception(ERRORS::SMTP_CONNECTION);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ DataValidator::with('CustomValidations', true);
|
|||
/**
|
||||
* @api {post} /ticket/comment Comment ticket
|
||||
* @apiVersion 4.1.0
|
||||
*
|
||||
*
|
||||
* @apiName Comment ticket
|
||||
*
|
||||
* @apiGroup Ticket
|
||||
|
|
@ -22,7 +22,7 @@ DataValidator::with('CustomValidations', true);
|
|||
* @apiUse INVALID_TICKET
|
||||
* @apiUse INVALID_TOKEN
|
||||
*
|
||||
* @apiSuccess {Object} data Empty object
|
||||
* @apiSuccess {Object} data Empty object
|
||||
*
|
||||
*/
|
||||
|
||||
|
|
@ -86,7 +86,7 @@ class CommentController extends Controller {
|
|||
}
|
||||
|
||||
Log::createLog('COMMENT', $this->ticket->ticketNumber);
|
||||
|
||||
|
||||
Response::respondSuccess();
|
||||
} else {
|
||||
Response::respondError(ERRORS::NO_PERMISSION);
|
||||
|
|
@ -132,14 +132,21 @@ class CommentController extends Controller {
|
|||
$name = $this->ticket->owner->name;
|
||||
}
|
||||
|
||||
$url = Setting::getSetting('url')->getValue();
|
||||
|
||||
if(!Controller::isUserSystemEnabled()) {
|
||||
$url .= '/check-ticket/' . $this->ticket->ticketNumber;
|
||||
$url .= '/' . $email;
|
||||
}
|
||||
|
||||
$mailSender->setTemplate(MailTemplate::TICKET_RESPONDED, [
|
||||
'to' => $email,
|
||||
'name' => $name,
|
||||
'ticketNumber' => $this->ticket->ticketNumber,
|
||||
'title' => $this->ticket->title,
|
||||
'url' => Setting::getSetting('url')->getValue()
|
||||
'ticketNumber' => $this->ticket->ticketNumber,
|
||||
'url' => $url
|
||||
]);
|
||||
|
||||
$mailSender->send();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -334,7 +334,7 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td class="mini-block-container">
|
||||
<table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:separate !important;">
|
||||
<table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:separate !important;">
|
||||
<tr>
|
||||
<td class="mini-block">
|
||||
<table cellpadding="0" cellspacing="0" width="100%">
|
||||
|
|
@ -346,11 +346,11 @@
|
|||
<tr>
|
||||
<td class="button">
|
||||
<div><!--[if mso]>
|
||||
<v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{url}}/check-ticket/{{ticketNumber}}/{{to}}" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f">
|
||||
<v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{url}}" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f">
|
||||
<w:anchorlock/>
|
||||
<center style="color:#ffffff;font-family:Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;">Check Ticket</center>
|
||||
</v:roundrect>
|
||||
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/check-ticket/{{ticketNumber}}/{{to}}"
|
||||
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}"
|
||||
style="background-color:#ff6f6f;border-radius:5px;color:#ffffff;display:inline-block;font-family:'Cabin', Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;line-height:45px;text-align:center;text-decoration:none;width:155px;-webkit-text-size-adjust:none;mso-hide:all;">Check Ticket</a></div>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
|
|||
Loading…
Reference in New Issue