From e8ee0427d0163048d76fdf409e823dd9e52c5497 Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 21 Apr 2017 01:43:06 -0300 Subject: [PATCH] Ivan - Fix some issues [skip ci] --- client/src/app-components/ticket-viewer.js | 6 +++--- client/src/data/languages/es.js | 2 +- server/controllers/article/add-topic.php | 2 +- server/controllers/article/add.php | 2 +- server/controllers/user/recover-password.php | 3 ++- server/data/mail-templates/user-password-forgot-cn.html | 6 +++--- server/data/mail-templates/user-password-forgot-de.html | 6 +++--- server/data/mail-templates/user-password-forgot-en.html | 6 +++--- server/data/mail-templates/user-password-forgot-es.html | 6 +++--- server/data/mail-templates/user-password-forgot-fr.html | 6 +++--- server/data/mail-templates/user-password-forgot-in.html | 6 +++--- server/data/mail-templates/user-password-forgot-jp.html | 6 +++--- server/data/mail-templates/user-password-forgot-pt.html | 6 +++--- server/data/mail-templates/user-password-forgot-ru.html | 6 +++--- server/data/mail-templates/user-password-forgot-tr.html | 6 +++--- 15 files changed, 38 insertions(+), 37 deletions(-) diff --git a/client/src/app-components/ticket-viewer.js b/client/src/app-components/ticket-viewer.js index b22effd0..14476b21 100644 --- a/client/src/app-components/ticket-viewer.js +++ b/client/src/app-components/ticket-viewer.js @@ -151,10 +151,10 @@ class TicketViewer extends React.Component { {i18n(priorities[this.props.ticket.priority || 'low'])}
- {(ticket.owner) ? ticket.owner.name : i18n('NONE')} + {this.renderOwnerNode()}
- {this.renderOwnerNode()} + {i18n((this.props.ticket.closed) ? 'CLOSED' : 'OPENED')}
@@ -171,7 +171,7 @@ class TicketViewer extends React.Component { ); } else { - ownerNode = i18n((this.props.ticket.closed) ? 'CLOSED' : 'OPENED'); + ownerNode = (this.props.ticket.owner) ? this.props.ticket.owner.name : i18n('NONE') } return ownerNode; diff --git a/client/src/data/languages/es.js b/client/src/data/languages/es.js index 42d0b364..ca369ea9 100644 --- a/client/src/data/languages/es.js +++ b/client/src/data/languages/es.js @@ -66,7 +66,7 @@ export default { 'DELETE': 'Borrar', 'LANGUAGE': 'Idioma', 'OWNER': 'Propietario', - 'OWNED': 'Propiedad', + 'OWNED': 'Asignado', 'STATUS': 'Estado', 'NONE': 'Ninguno', 'OPENED': 'Abierto', diff --git a/server/controllers/article/add-topic.php b/server/controllers/article/add-topic.php index d58e6458..586119ce 100755 --- a/server/controllers/article/add-topic.php +++ b/server/controllers/article/add-topic.php @@ -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 ] ] diff --git a/server/controllers/article/add.php b/server/controllers/article/add.php index 71fc92c5..58d4c234 100755 --- a/server/controllers/article/add.php +++ b/server/controllers/article/add.php @@ -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' => [ diff --git a/server/controllers/user/recover-password.php b/server/controllers/user/recover-password.php index 4aec4efe..29ed1705 100755 --- a/server/controllers/user/recover-password.php +++ b/server/controllers/user/recover-password.php @@ -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(); diff --git a/server/data/mail-templates/user-password-forgot-cn.html b/server/data/mail-templates/user-password-forgot-cn.html index ecf2f202..60ba8b6e 100755 --- a/server/data/mail-templates/user-password-forgot-cn.html +++ b/server/data/mail-templates/user-password-forgot-cn.html @@ -340,7 +340,7 @@ @@ -351,11 +351,11 @@ diff --git a/server/data/mail-templates/user-password-forgot-de.html b/server/data/mail-templates/user-password-forgot-de.html index f5f9b146..d4ef70fa 100755 --- a/server/data/mail-templates/user-password-forgot-de.html +++ b/server/data/mail-templates/user-password-forgot-de.html @@ -340,7 +340,7 @@
- 使用此代码 {{url}}/recover-password?email={{email}}&token={{token}} 或单击下面的按钮. + 使用此代码 {{url}}/recover-password?email={{to}}&token={{token}} 或单击下面的按钮.
@@ -351,11 +351,11 @@ diff --git a/server/data/mail-templates/user-password-forgot-en.html b/server/data/mail-templates/user-password-forgot-en.html index 3cf8fc20..25a7b38c 100755 --- a/server/data/mail-templates/user-password-forgot-en.html +++ b/server/data/mail-templates/user-password-forgot-en.html @@ -340,7 +340,7 @@
- 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.
@@ -351,11 +351,11 @@ diff --git a/server/data/mail-templates/user-password-forgot-es.html b/server/data/mail-templates/user-password-forgot-es.html index 7a887743..c52856d0 100755 --- a/server/data/mail-templates/user-password-forgot-es.html +++ b/server/data/mail-templates/user-password-forgot-es.html @@ -340,7 +340,7 @@
- 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.
@@ -351,11 +351,11 @@ diff --git a/server/data/mail-templates/user-password-forgot-fr.html b/server/data/mail-templates/user-password-forgot-fr.html index 3ea018c0..bb689d3b 100755 --- a/server/data/mail-templates/user-password-forgot-fr.html +++ b/server/data/mail-templates/user-password-forgot-fr.html @@ -340,7 +340,7 @@
- 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.
@@ -351,11 +351,11 @@ diff --git a/server/data/mail-templates/user-password-forgot-in.html b/server/data/mail-templates/user-password-forgot-in.html index f3cd527e..0db78ece 100755 --- a/server/data/mail-templates/user-password-forgot-in.html +++ b/server/data/mail-templates/user-password-forgot-in.html @@ -341,7 +341,7 @@
- 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.
@@ -352,11 +352,11 @@ diff --git a/server/data/mail-templates/user-password-forgot-jp.html b/server/data/mail-templates/user-password-forgot-jp.html index ef6cb529..600a12f5 100755 --- a/server/data/mail-templates/user-password-forgot-jp.html +++ b/server/data/mail-templates/user-password-forgot-jp.html @@ -340,7 +340,7 @@
- इस कोड का उपयोग करें {{url}}/recover-password?email={{email}}&token={{token}} या नीचे दिए गए बटन पर क्लिक करें. + इस कोड का उपयोग करें {{url}}/recover-password?email={{to}}&token={{token}} या नीचे दिए गए बटन पर क्लिक करें.
@@ -351,11 +351,11 @@ diff --git a/server/data/mail-templates/user-password-forgot-pt.html b/server/data/mail-templates/user-password-forgot-pt.html index 43414af9..2db29ee0 100755 --- a/server/data/mail-templates/user-password-forgot-pt.html +++ b/server/data/mail-templates/user-password-forgot-pt.html @@ -340,7 +340,7 @@
- でこのコードを使用 {{url}}/recover-password?email={{email}}&token={{token}} 下のボタンをクリックしてください. + でこのコードを使用 {{url}}/recover-password?email={{to}}&token={{token}} 下のボタンをクリックしてください.
@@ -351,11 +351,11 @@ diff --git a/server/data/mail-templates/user-password-forgot-ru.html b/server/data/mail-templates/user-password-forgot-ru.html index ad64c7dd..22e35038 100755 --- a/server/data/mail-templates/user-password-forgot-ru.html +++ b/server/data/mail-templates/user-password-forgot-ru.html @@ -340,7 +340,7 @@
- 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.
@@ -351,11 +351,11 @@ diff --git a/server/data/mail-templates/user-password-forgot-tr.html b/server/data/mail-templates/user-password-forgot-tr.html index 971dc426..2504a623 100755 --- a/server/data/mail-templates/user-password-forgot-tr.html +++ b/server/data/mail-templates/user-password-forgot-tr.html @@ -340,7 +340,7 @@
- Используйте этот код в {{url}}/recover-password?email={{email}}&token={{token}} или нажмите кнопку ниже. + Используйте этот код в {{url}}/recover-password?email={{to}}&token={{token}} или нажмите кнопку ниже.
@@ -351,11 +351,11 @@
- 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.