summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/Controller/TaskMailController.php12
-rw-r--r--app/Locale/bs_BA/translations.php1
-rw-r--r--app/Locale/ca_ES/translations.php1
-rw-r--r--app/Locale/cs_CZ/translations.php1
-rw-r--r--app/Locale/da_DK/translations.php1
-rw-r--r--app/Locale/de_DE/translations.php1
-rw-r--r--app/Locale/el_GR/translations.php1
-rw-r--r--app/Locale/es_ES/translations.php1
-rw-r--r--app/Locale/fi_FI/translations.php1
-rw-r--r--app/Locale/fr_FR/translations.php1
-rw-r--r--app/Locale/hr_HR/translations.php1
-rw-r--r--app/Locale/hu_HU/translations.php1
-rw-r--r--app/Locale/id_ID/translations.php1
-rw-r--r--app/Locale/it_IT/translations.php1
-rw-r--r--app/Locale/ja_JP/translations.php1
-rw-r--r--app/Locale/ko_KR/translations.php1
-rw-r--r--app/Locale/my_MY/translations.php1
-rw-r--r--app/Locale/nb_NO/translations.php1
-rw-r--r--app/Locale/nl_NL/translations.php1
-rw-r--r--app/Locale/pl_PL/translations.php1
-rw-r--r--app/Locale/pt_BR/translations.php1
-rw-r--r--app/Locale/pt_PT/translations.php1
-rw-r--r--app/Locale/ru_RU/translations.php1
-rw-r--r--app/Locale/sr_Latn_RS/translations.php1
-rw-r--r--app/Locale/sv_SE/translations.php1
-rw-r--r--app/Locale/th_TH/translations.php1
-rw-r--r--app/Locale/tr_TR/translations.php1
-rw-r--r--app/Locale/zh_CN/translations.php1
-rw-r--r--app/Template/task_mail/create.php2
29 files changed, 5 insertions, 36 deletions
diff --git a/app/Controller/TaskMailController.php b/app/Controller/TaskMailController.php
index 64b81f8f..feb96a68 100644
--- a/app/Controller/TaskMailController.php
+++ b/app/Controller/TaskMailController.php
@@ -35,13 +35,11 @@ class TaskMailController extends BaseController
$this->sendByEmail($values, $task);
$this->flash->success(t('Task sent by email successfully.'));
- if (isset($values['add_comment']) && $values['add_comment'] == 1) {
- $this->commentModel->create(array(
- 'comment' => t('This task was sent by email to "%s" with subject "%s".', $values['email'], $values['subject']),
- 'user_id' => $this->userSession->getId(),
- 'task_id' => $task['id'],
- ));
- }
+ $this->commentModel->create(array(
+ 'comment' => t('This task was sent by email to "%s" with subject "%s".', $values['email'], $values['subject']),
+ 'user_id' => $this->userSession->getId(),
+ 'task_id' => $task['id'],
+ ));
$this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), 'comments'), true);
} else {
diff --git a/app/Locale/bs_BA/translations.php b/app/Locale/bs_BA/translations.php
index 32d3d02f..0955c908 100644
--- a/app/Locale/bs_BA/translations.php
+++ b/app/Locale/bs_BA/translations.php
@@ -1336,7 +1336,6 @@ return array(
// 'Remove user from group' => '',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Locale/ca_ES/translations.php b/app/Locale/ca_ES/translations.php
index 0f5a2110..384216b5 100644
--- a/app/Locale/ca_ES/translations.php
+++ b/app/Locale/ca_ES/translations.php
@@ -1336,7 +1336,6 @@ return array(
// 'Remove user from group' => '',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Locale/cs_CZ/translations.php b/app/Locale/cs_CZ/translations.php
index 75952c95..b6113340 100644
--- a/app/Locale/cs_CZ/translations.php
+++ b/app/Locale/cs_CZ/translations.php
@@ -1336,7 +1336,6 @@ return array(
// 'Remove user from group' => '',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php
index d9a1541c..f15abb7f 100644
--- a/app/Locale/da_DK/translations.php
+++ b/app/Locale/da_DK/translations.php
@@ -1336,7 +1336,6 @@ return array(
// 'Remove user from group' => '',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php
index ca25b828..92774ffd 100644
--- a/app/Locale/de_DE/translations.php
+++ b/app/Locale/de_DE/translations.php
@@ -1336,7 +1336,6 @@ return array(
// 'Remove user from group' => '',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Locale/el_GR/translations.php b/app/Locale/el_GR/translations.php
index 560a823e..e7b30f8d 100644
--- a/app/Locale/el_GR/translations.php
+++ b/app/Locale/el_GR/translations.php
@@ -1336,7 +1336,6 @@ return array(
// 'Remove user from group' => '',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php
index b43b1188..b9750d3c 100644
--- a/app/Locale/es_ES/translations.php
+++ b/app/Locale/es_ES/translations.php
@@ -1336,7 +1336,6 @@ return array(
// 'Remove user from group' => '',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php
index 07e7f674..9a04178f 100644
--- a/app/Locale/fi_FI/translations.php
+++ b/app/Locale/fi_FI/translations.php
@@ -1336,7 +1336,6 @@ return array(
// 'Remove user from group' => '',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php
index 66a399b9..5e183eaf 100644
--- a/app/Locale/fr_FR/translations.php
+++ b/app/Locale/fr_FR/translations.php
@@ -1336,7 +1336,6 @@ return array(
'Remove user from group' => 'Supprimer cet utilisateur du groupe',
'Assign the task to its creator' => 'Assigner une tâche à son créateur',
'This task was sent by email to "%s" with subject "%s".' => 'Cette tâche a été envoyée par courrier électronique à « %s » avec le sujet « %s ».',
- 'Log this action in a comment' => 'Enregistrez cette action dans un commentaire',
'Predefined Email Subjects' => 'Sujets de courrier électronique prédéfinis',
'Write one subject by line.' => 'Écrivez un sujet par ligne.',
);
diff --git a/app/Locale/hr_HR/translations.php b/app/Locale/hr_HR/translations.php
index f676c31d..18fec07a 100644
--- a/app/Locale/hr_HR/translations.php
+++ b/app/Locale/hr_HR/translations.php
@@ -1336,7 +1336,6 @@ return array(
// 'Remove user from group' => '',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php
index 16dd9a94..db50d18b 100644
--- a/app/Locale/hu_HU/translations.php
+++ b/app/Locale/hu_HU/translations.php
@@ -1336,7 +1336,6 @@ return array(
'Remove user from group' => 'Felhasználó eltávolítása a csoportból',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Locale/id_ID/translations.php b/app/Locale/id_ID/translations.php
index f857eec3..cebace76 100644
--- a/app/Locale/id_ID/translations.php
+++ b/app/Locale/id_ID/translations.php
@@ -1336,7 +1336,6 @@ return array(
// 'Remove user from group' => '',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php
index ec7f0084..e5b48b6b 100644
--- a/app/Locale/it_IT/translations.php
+++ b/app/Locale/it_IT/translations.php
@@ -1336,7 +1336,6 @@ return array(
// 'Remove user from group' => '',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php
index f6749ba6..91d1199c 100644
--- a/app/Locale/ja_JP/translations.php
+++ b/app/Locale/ja_JP/translations.php
@@ -1336,7 +1336,6 @@ return array(
// 'Remove user from group' => '',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Locale/ko_KR/translations.php b/app/Locale/ko_KR/translations.php
index 6bc810ec..804e9c3d 100644
--- a/app/Locale/ko_KR/translations.php
+++ b/app/Locale/ko_KR/translations.php
@@ -1336,7 +1336,6 @@ return array(
// 'Remove user from group' => '',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Locale/my_MY/translations.php b/app/Locale/my_MY/translations.php
index c78bc737..2317755e 100644
--- a/app/Locale/my_MY/translations.php
+++ b/app/Locale/my_MY/translations.php
@@ -1336,7 +1336,6 @@ return array(
// 'Remove user from group' => '',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Locale/nb_NO/translations.php b/app/Locale/nb_NO/translations.php
index b6042e99..8a93f5d8 100644
--- a/app/Locale/nb_NO/translations.php
+++ b/app/Locale/nb_NO/translations.php
@@ -1336,7 +1336,6 @@ return array(
// 'Remove user from group' => '',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php
index 6b39c893..41b20116 100644
--- a/app/Locale/nl_NL/translations.php
+++ b/app/Locale/nl_NL/translations.php
@@ -1336,7 +1336,6 @@ return array(
// 'Remove user from group' => '',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php
index 7922bf4b..aab6e6c9 100644
--- a/app/Locale/pl_PL/translations.php
+++ b/app/Locale/pl_PL/translations.php
@@ -1336,7 +1336,6 @@ return array(
// 'Remove user from group' => '',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php
index 7bbdb8dc..82771ee4 100644
--- a/app/Locale/pt_BR/translations.php
+++ b/app/Locale/pt_BR/translations.php
@@ -1336,7 +1336,6 @@ return array(
'Remove user from group' => 'Remover usuário do grupo',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Locale/pt_PT/translations.php b/app/Locale/pt_PT/translations.php
index 23c7d7f1..a060b030 100644
--- a/app/Locale/pt_PT/translations.php
+++ b/app/Locale/pt_PT/translations.php
@@ -1336,7 +1336,6 @@ return array(
// 'Remove user from group' => '',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php
index 34357e01..f6bff006 100644
--- a/app/Locale/ru_RU/translations.php
+++ b/app/Locale/ru_RU/translations.php
@@ -1336,7 +1336,6 @@ return array(
// 'Remove user from group' => '',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php
index 83d7c3da..9c7c5b33 100644
--- a/app/Locale/sr_Latn_RS/translations.php
+++ b/app/Locale/sr_Latn_RS/translations.php
@@ -1336,7 +1336,6 @@ return array(
// 'Remove user from group' => '',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php
index a04dfdcd..c2cbb99a 100644
--- a/app/Locale/sv_SE/translations.php
+++ b/app/Locale/sv_SE/translations.php
@@ -1336,7 +1336,6 @@ return array(
// 'Remove user from group' => '',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php
index 4cb4b5e7..eeff82c9 100644
--- a/app/Locale/th_TH/translations.php
+++ b/app/Locale/th_TH/translations.php
@@ -1336,7 +1336,6 @@ return array(
// 'Remove user from group' => '',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php
index d09e7bb0..63a9892d 100644
--- a/app/Locale/tr_TR/translations.php
+++ b/app/Locale/tr_TR/translations.php
@@ -1336,7 +1336,6 @@ return array(
// 'Remove user from group' => '',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php
index 21175681..9b7e38db 100644
--- a/app/Locale/zh_CN/translations.php
+++ b/app/Locale/zh_CN/translations.php
@@ -1336,7 +1336,6 @@ return array(
// 'Remove user from group' => '',
// 'Assign the task to its creator' => '',
// 'This task was sent by email to "%s" with subject "%s".' => '',
- // 'Log this action in a comment' => '',
// 'Predefined Email Subjects' => '',
// 'Write one subject by line.' => '',
);
diff --git a/app/Template/task_mail/create.php b/app/Template/task_mail/create.php
index 4e843de9..f369ef99 100644
--- a/app/Template/task_mail/create.php
+++ b/app/Template/task_mail/create.php
@@ -40,8 +40,6 @@
</div>
<?php endif ?>
- <?= $this->form->checkbox('add_comment', t('Log this action in a comment'), 1) ?>
-
<?= $this->modal->submitButtons(array(
'submitLabel' => t('Send by email'),
'tabindex' => 3,