tyler.durden
/
opensupports
mirror of https://github.com/opensupports/opensupports.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ivan - Fix some issues [skip ci]

This commit is contained in:
ivan 2017-04-21 01:43:06 -03:00
parent 7b8226f579
commit e8ee0427d0
15 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,10 +151,10 @@ class TicketViewer extends React.Component {
{i18n(priorities[this.props.ticket.priority || 'low'])}
</div>
<div className="col-md-4">
{(ticket.owner) ? ticket.owner.name : i18n('NONE')}
{this.renderOwnerNode()}
</div>
<div className="col-md-4">
{this.renderOwnerNode()}
{i18n((this.props.ticket.closed) ? 'CLOSED' : 'OPENED')}
</div>
</div>
</div>
@ -171,7 +171,7 @@ class TicketViewer extends React.Component {
</Button>
);
} else {
ownerNode = i18n((this.props.ticket.closed) ? 'CLOSED' : 'OPENED');
ownerNode = (this.props.ticket.owner) ? this.props.ticket.owner.name : i18n('NONE')
}
return ownerNode;

2
client/src/data/languages/es.js
View File

@ -66,7 +66,7 @@ export default {
'DELETE': 'Borrar',
'LANGUAGE': 'Idioma',
'OWNER': 'Propietario',
'OWNED': 'Propiedad',
'OWNED': 'Asignado',
'STATUS': 'Estado',
'NONE': 'Ninguno',
'OPENED': 'Abierto',

2
server/controllers/article/add-topic.php
View File

@ -11,7 +11,7 @@ class AddTopicController extends Controller {
'permission' => 'staff_2',
'requestData' => [
'name' => [
'validation' => DataValidator::length(3, 40),
'validation' => DataValidator::length(3, 100),
'error' => ERRORS::INVALID_NAME
]
]

2
server/controllers/article/add.php
View File

@ -11,7 +11,7 @@ class AddArticleController extends Controller {
'permission' => 'staff_2',
'requestData' => [
'title' => [
'validation' => DataValidator::length(3, 40),
'validation' => DataValidator::length(3, 100),
'error' => ERRORS::INVALID_NAME
],
'content' => [

3
server/controllers/user/recover-password.php
View File

@ -65,7 +65,8 @@ class RecoverPasswordController extends Controller {
$mailSender->setTemplate(MailTemplate::USER_PASSWORD, [
'to' => $this->user->email,
'name' => $this->user->name,
'url' => Setting::getSetting('url')->getValue(),
'name' => $this->user->name
]);
$mailSender->send();

6
server/data/mail-templates/user-password-forgot-cn.html
View File

@ -340,7 +340,7 @@
<table cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="padding-bottom: 30px;">
使用此代码 {{url}}/recover-password?email={{email}}&token={{token}} 或单击下面的按钮.
使用此代码 {{url}}/recover-password?email={{to}}&token={{token}} 或单击下面的按钮.
</td>
</tr>
<tr>
@ -351,11 +351,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}}/recover-password?email={{email}}&token={{token}}" 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}}/recover-password?email={{to}}&token={{token}}" 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;">恢复密码</center>
</v:roundrect>
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{email}}&token={{token}}"
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{to}}&token={{token}}"
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;">恢复密码</a></div>
</td>
</tr>

6
server/data/mail-templates/user-password-forgot-de.html
View File

@ -340,7 +340,7 @@
<table cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="padding-bottom: 30px;">
Verwenden Sie diesen Code in {{url}}/recover-password?email={{email}}&token={{token}} oder klicken Sie auf die Schaltfläche unten.
Verwenden Sie diesen Code in {{url}}/recover-password?email={{to}}&token={{token}} oder klicken Sie auf die Schaltfläche unten.
</td>
</tr>
<tr>
@ -351,11 +351,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}}/recover-password?email={{email}}&token={{token}}" 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}}/recover-password?email={{to}}&token={{token}}" 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;">Passwort wiederherstellen</center>
</v:roundrect>
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{email}}&token={{token}}"
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{to}}&token={{token}}"
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;">Passwort wiederherstellen</a></div>
</td>
</tr>

6
server/data/mail-templates/user-password-forgot-en.html
View File

@ -340,7 +340,7 @@
<table cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="padding-bottom: 30px;">
Use this code in {{url}}/recover-password?email={{email}}&token={{token}} or click the button below.
Use this code in {{url}}/recover-password?email={{to}}&token={{token}} or click the button below.
</td>
</tr>
<tr>
@ -351,11 +351,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}}/recover-password?email={{email}}&token={{token}}" 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}}/recover-password?email={{to}}&token={{token}}" 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;">Recover password</center>
</v:roundrect>
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{email}}&token={{token}}"
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{to}}&token={{token}}"
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;">Recover password</a></div>
</td>
</tr>

6
server/data/mail-templates/user-password-forgot-es.html
View File

@ -340,7 +340,7 @@
<table cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="padding-bottom: 30px;">
Usá este codigo en {{url}}/recover-password?email={{email}}&token={{token}} o hacé click en el botón de abajo.
Usá este codigo en {{url}}/recover-password?email={{to}}&token={{token}} o hacé click en el botón de abajo.
</td>
</tr>
<tr>
@ -351,11 +351,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}}/recover-password?email={{email}}&token={{token}}" 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}}/recover-password?email={{to}}&token={{token}}" 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;">Recuperar contraseña</center>
</v:roundrect>
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{email}}&token={{token}}"
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{to}}&token={{token}}"
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;">Recuperar contraseña</a></div>
</td>
</tr>

6
server/data/mail-templates/user-password-forgot-fr.html
View File

@ -340,7 +340,7 @@
<table cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="padding-bottom: 30px;">
Utilisez ce code dans {{url}}/recover-password?email={{email}}&token={{token}} ou cliquez sur le bouton ci-dessous.
Utilisez ce code dans {{url}}/recover-password?email={{to}}&token={{token}} ou cliquez sur le bouton ci-dessous.
</td>
</tr>
<tr>
@ -351,11 +351,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}}/recover-password?email={{email}}&token={{token}}" 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}}/recover-password?email={{to}}&token={{token}}" 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;">Récupérer mot de passe</center>
</v:roundrect>
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{email}}&token={{token}}"
<![endif]--><a class="button-mobile" target="_blank" href="{{to}}/recover-password?email={{to}}&token={{token}}"
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;">Récupérer mot de passe</a></div>
</td>
</tr>

6
server/data/mail-templates/user-password-forgot-in.html
View File

@ -341,7 +341,7 @@
<table cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="padding-bottom: 30px;">
इस कोड का उपयोग करें {{url}}/recover-password?email={{email}}&token={{token}} या नीचे दिए गए बटन पर क्लिक करें.
इस कोड का उपयोग करें {{url}}/recover-password?email={{to}}&token={{token}} या नीचे दिए गए बटन पर क्लिक करें.
</td>
</tr>
<tr>
@ -352,11 +352,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}}/recover-password?email={{email}}&token={{token}}" 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}}/recover-password?email={{to}}&token={{token}}" 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;">गोपनीय शब्द पुन प्राप्त करे</center>
</v:roundrect>
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{email}}&token={{token}}"
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{to}}&token={{token}}"
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;">गोपनीय शब्द पुन प्राप्त करे</a></div>
</td>
</tr>

6
server/data/mail-templates/user-password-forgot-jp.html
View File

@ -340,7 +340,7 @@
<table cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="padding-bottom: 30px;">
でこのコードを使用 {{url}}/recover-password?email={{email}}&token={{token}} 下のボタンをクリックしてください.
でこのコードを使用 {{url}}/recover-password?email={{to}}&token={{token}} 下のボタンをクリックしてください.
</td>
</tr>
<tr>
@ -351,11 +351,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}}/recover-password?email={{email}}&token={{token}}" 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}}/recover-password?email={{to}}&token={{token}}" 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;">パスワードを回復</center>
</v:roundrect>
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{email}}&token={{token}}"
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{to}}&token={{token}}"
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;">パスワードを回復</a></div>
</td>
</tr>

6
server/data/mail-templates/user-password-forgot-pt.html
View File

@ -340,7 +340,7 @@
<table cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="padding-bottom: 30px;">
Use este código em {{url}}/recover-password?email={{email}}&token={{token}} ou clique no botão abaixo.
Use este código em {{url}}/recover-password?email={{to}}&token={{token}} ou clique no botão abaixo.
</td>
</tr>
<tr>
@ -351,11 +351,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}}/recover-password?email={{email}}&token={{token}}" 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}}/recover-password?email={{to}}&token={{token}}" 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;">Recuperar senha</center>
</v:roundrect>
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{email}}&token={{token}}"
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{to}}&token={{token}}"
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;">Recuperar senha</a></div>
</td>
</tr>

6
server/data/mail-templates/user-password-forgot-ru.html
View File

@ -340,7 +340,7 @@
<table cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="padding-bottom: 30px;">
Используйте этот код в {{url}}/recover-password?email={{email}}&token={{token}} или нажмите кнопку ниже.
Используйте этот код в {{url}}/recover-password?email={{to}}&token={{token}} или нажмите кнопку ниже.
</td>
</tr>
<tr>
@ -351,11 +351,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}}/recover-password?email={{email}}&token={{token}}" 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}}/recover-password?email={{to}}&token={{token}}" 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;">Восстановить пароль</center>
</v:roundrect>
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{email}}&token={{token}}"
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{to}}&token={{token}}"
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;">Восстановить пароль</a></div>
</td>
</tr>

6
server/data/mail-templates/user-password-forgot-tr.html
View File

@ -340,7 +340,7 @@
<table cellpadding="0" cellspacing="0" width="100%">
<tr>
<td style="padding-bottom: 30px;">
Bu kodu şu adreste kullanın {{url}}/recover-password?email={{email}}&token={{token}} veya aşağıdaki butona tıklayın.
Bu kodu şu adreste kullanın {{url}}/recover-password?email={{to}}&token={{token}} veya aşağıdaki butona tıklayın.
</td>
</tr>
<tr>
@ -351,11 +351,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}}/recover-password?email={{email}}&token={{token}}" 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}}/recover-password?email={{to}}&token={{token}}" 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;">Şifre kurtarma</center>
</v:roundrect>
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{email}}&token={{token}}"
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{to}}&token={{token}}"
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;">Şifre kurtarma</a></div>
</td>
</tr>