Remove checkbox to simplify task mail form
This commit is contained in:
parent
abebd92629
commit
3909814313
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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.' => '',
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Reference in New Issue