diff options
Diffstat (limited to 'app')
28 files changed, 62 insertions, 6 deletions
diff --git a/app/Helper/Task.php b/app/Helper/Task.php index d2c59ee9..06f7d58e 100644 --- a/app/Helper/Task.php +++ b/app/Helper/Task.php @@ -45,6 +45,17 @@ class Task extends Base return $this->taskPermission->canRemoveTask($task); } + public function selectAssignee(array $users, array $values, array $errors = array(), array $attributes = array()) + { + $attributes = array_merge(array('tabindex="3"'), $attributes); + + $html = $this->helper->form->label(t('Assignee'), 'owner_id'); + $html .= $this->helper->form->select('owner_id', $users, $values, $errors, $attributes); + $html .= '<a href="#" class="assign-me" data-target-id="form-owner_id" data-current-id="'.$this->userSession->getId().'" title="'.t('Assign to me').'">'.t('Me').'</a>'; + + return $html; + } + public function selectPriority(array $project, array $values) { $html = ''; diff --git a/app/Locale/bs_BA/translations.php b/app/Locale/bs_BA/translations.php index af090d23..c6005e78 100644 --- a/app/Locale/bs_BA/translations.php +++ b/app/Locale/bs_BA/translations.php @@ -1123,4 +1123,6 @@ return array( // 'There is no external link for the moment.' => '', // 'Internal links' => '', // 'There is no internal link for the moment.' => '', + // 'Assign to me' => '', + // 'Me' => '', ); diff --git a/app/Locale/cs_CZ/translations.php b/app/Locale/cs_CZ/translations.php index 6dacadcb..8d153279 100644 --- a/app/Locale/cs_CZ/translations.php +++ b/app/Locale/cs_CZ/translations.php @@ -1123,4 +1123,6 @@ return array( // 'There is no external link for the moment.' => '', // 'Internal links' => '', // 'There is no internal link for the moment.' => '', + // 'Assign to me' => '', + // 'Me' => '', ); diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php index e30eac46..c6a3d099 100644 --- a/app/Locale/da_DK/translations.php +++ b/app/Locale/da_DK/translations.php @@ -1123,4 +1123,6 @@ return array( // 'There is no external link for the moment.' => '', // 'Internal links' => '', // 'There is no internal link for the moment.' => '', + // 'Assign to me' => '', + // 'Me' => '', ); diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php index 77835aa2..01defc76 100644 --- a/app/Locale/de_DE/translations.php +++ b/app/Locale/de_DE/translations.php @@ -1123,4 +1123,6 @@ return array( // 'There is no external link for the moment.' => '', // 'Internal links' => '', // 'There is no internal link for the moment.' => '', + // 'Assign to me' => '', + // 'Me' => '', ); diff --git a/app/Locale/el_GR/translations.php b/app/Locale/el_GR/translations.php index d75c25d1..5e62b6ed 100644 --- a/app/Locale/el_GR/translations.php +++ b/app/Locale/el_GR/translations.php @@ -1123,4 +1123,6 @@ return array( // 'There is no external link for the moment.' => '', // 'Internal links' => '', // 'There is no internal link for the moment.' => '', + // 'Assign to me' => '', + // 'Me' => '', ); diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php index 02dd6790..05f3ce1b 100644 --- a/app/Locale/es_ES/translations.php +++ b/app/Locale/es_ES/translations.php @@ -1123,4 +1123,6 @@ return array( // 'There is no external link for the moment.' => '', // 'Internal links' => '', // 'There is no internal link for the moment.' => '', + // 'Assign to me' => '', + // 'Me' => '', ); diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php index df20259a..06eba55f 100644 --- a/app/Locale/fi_FI/translations.php +++ b/app/Locale/fi_FI/translations.php @@ -1123,4 +1123,6 @@ return array( // 'There is no external link for the moment.' => '', // 'Internal links' => '', // 'There is no internal link for the moment.' => '', + // 'Assign to me' => '', + // 'Me' => '', ); diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php index df74e5b4..c85ba6ba 100644 --- a/app/Locale/fr_FR/translations.php +++ b/app/Locale/fr_FR/translations.php @@ -1126,4 +1126,6 @@ return array( 'There is no external link for the moment.' => 'Il n\'y a pas de lien externe pour le moment.', 'Internal links' => 'Liens internes', 'There is no internal link for the moment.' => 'Il n\'y a pas de lien interne pour le moment.', + 'Assign to me' => 'Assigner à moi', + 'Me' => 'Moi', ); diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php index b8d6d1b6..ec8e7cd8 100644 --- a/app/Locale/hu_HU/translations.php +++ b/app/Locale/hu_HU/translations.php @@ -1123,4 +1123,6 @@ return array( // 'There is no external link for the moment.' => '', // 'Internal links' => '', // 'There is no internal link for the moment.' => '', + // 'Assign to me' => '', + // 'Me' => '', ); diff --git a/app/Locale/id_ID/translations.php b/app/Locale/id_ID/translations.php index 02ee727c..ce51b418 100644 --- a/app/Locale/id_ID/translations.php +++ b/app/Locale/id_ID/translations.php @@ -1123,4 +1123,6 @@ return array( // 'There is no external link for the moment.' => '', // 'Internal links' => '', // 'There is no internal link for the moment.' => '', + // 'Assign to me' => '', + // 'Me' => '', ); diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php index b9c45642..2ce440f2 100644 --- a/app/Locale/it_IT/translations.php +++ b/app/Locale/it_IT/translations.php @@ -1123,4 +1123,6 @@ return array( // 'There is no external link for the moment.' => '', // 'Internal links' => '', // 'There is no internal link for the moment.' => '', + // 'Assign to me' => '', + // 'Me' => '', ); diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php index a16c44e8..1a023b5a 100644 --- a/app/Locale/ja_JP/translations.php +++ b/app/Locale/ja_JP/translations.php @@ -1123,4 +1123,6 @@ return array( // 'There is no external link for the moment.' => '', // 'Internal links' => '', // 'There is no internal link for the moment.' => '', + // 'Assign to me' => '', + // 'Me' => '', ); diff --git a/app/Locale/my_MY/translations.php b/app/Locale/my_MY/translations.php index 93185888..c112f6c1 100644 --- a/app/Locale/my_MY/translations.php +++ b/app/Locale/my_MY/translations.php @@ -1123,4 +1123,6 @@ return array( // 'There is no external link for the moment.' => '', // 'Internal links' => '', // 'There is no internal link for the moment.' => '', + // 'Assign to me' => '', + // 'Me' => '', ); diff --git a/app/Locale/nb_NO/translations.php b/app/Locale/nb_NO/translations.php index b35dce3d..d0fce9ec 100644 --- a/app/Locale/nb_NO/translations.php +++ b/app/Locale/nb_NO/translations.php @@ -1123,4 +1123,6 @@ return array( // 'There is no external link for the moment.' => '', // 'Internal links' => '', // 'There is no internal link for the moment.' => '', + // 'Assign to me' => '', + // 'Me' => '', ); diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php index 0117a978..2394d505 100644 --- a/app/Locale/nl_NL/translations.php +++ b/app/Locale/nl_NL/translations.php @@ -1123,4 +1123,6 @@ return array( // 'There is no external link for the moment.' => '', // 'Internal links' => '', // 'There is no internal link for the moment.' => '', + // 'Assign to me' => '', + // 'Me' => '', ); diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php index 4f4f840f..6122f7fd 100644 --- a/app/Locale/pl_PL/translations.php +++ b/app/Locale/pl_PL/translations.php @@ -1123,4 +1123,6 @@ return array( // 'There is no external link for the moment.' => '', // 'Internal links' => '', // 'There is no internal link for the moment.' => '', + // 'Assign to me' => '', + // 'Me' => '', ); diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php index 1b5b35a6..e5f6c152 100644 --- a/app/Locale/pt_BR/translations.php +++ b/app/Locale/pt_BR/translations.php @@ -1123,4 +1123,6 @@ return array( // 'There is no external link for the moment.' => '', // 'Internal links' => '', // 'There is no internal link for the moment.' => '', + // 'Assign to me' => '', + // 'Me' => '', ); diff --git a/app/Locale/pt_PT/translations.php b/app/Locale/pt_PT/translations.php index baa8eab0..9961a943 100644 --- a/app/Locale/pt_PT/translations.php +++ b/app/Locale/pt_PT/translations.php @@ -1123,4 +1123,6 @@ return array( // 'There is no external link for the moment.' => '', // 'Internal links' => '', // 'There is no internal link for the moment.' => '', + // 'Assign to me' => '', + // 'Me' => '', ); diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php index 3aa717b9..9d1a0a7c 100644 --- a/app/Locale/ru_RU/translations.php +++ b/app/Locale/ru_RU/translations.php @@ -1123,4 +1123,6 @@ return array( // 'There is no external link for the moment.' => '', // 'Internal links' => '', // 'There is no internal link for the moment.' => '', + // 'Assign to me' => '', + // 'Me' => '', ); diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php index 4b320fe7..50abe032 100644 --- a/app/Locale/sr_Latn_RS/translations.php +++ b/app/Locale/sr_Latn_RS/translations.php @@ -1123,4 +1123,6 @@ return array( // 'There is no external link for the moment.' => '', // 'Internal links' => '', // 'There is no internal link for the moment.' => '', + // 'Assign to me' => '', + // 'Me' => '', ); diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php index c225cc05..bfbc4cbb 100644 --- a/app/Locale/sv_SE/translations.php +++ b/app/Locale/sv_SE/translations.php @@ -1123,4 +1123,6 @@ return array( // 'There is no external link for the moment.' => '', // 'Internal links' => '', // 'There is no internal link for the moment.' => '', + // 'Assign to me' => '', + // 'Me' => '', ); diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php index 7fa53c6f..e9e67c8f 100644 --- a/app/Locale/th_TH/translations.php +++ b/app/Locale/th_TH/translations.php @@ -1123,4 +1123,6 @@ return array( // 'There is no external link for the moment.' => '', // 'Internal links' => '', // 'There is no internal link for the moment.' => '', + // 'Assign to me' => '', + // 'Me' => '', ); diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php index 35613345..6dc9aa7c 100644 --- a/app/Locale/tr_TR/translations.php +++ b/app/Locale/tr_TR/translations.php @@ -1123,4 +1123,6 @@ return array( // 'There is no external link for the moment.' => '', // 'Internal links' => '', // 'There is no internal link for the moment.' => '', + // 'Assign to me' => '', + // 'Me' => '', ); diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php index 9de31cdd..ebb12115 100644 --- a/app/Locale/zh_CN/translations.php +++ b/app/Locale/zh_CN/translations.php @@ -1123,4 +1123,6 @@ return array( // 'There is no external link for the moment.' => '', // 'Internal links' => '', // 'There is no internal link for the moment.' => '', + // 'Assign to me' => '', + // 'Me' => '', ); diff --git a/app/Template/board/popover_assignee.php b/app/Template/board/popover_assignee.php index e86ba420..8db95323 100644 --- a/app/Template/board/popover_assignee.php +++ b/app/Template/board/popover_assignee.php @@ -9,8 +9,7 @@ <?= $this->form->hidden('id', $values) ?> <?= $this->form->hidden('project_id', $values) ?> - <?= $this->form->label(t('Assignee'), 'owner_id') ?> - <?= $this->form->select('owner_id', $users_list, $values, array(), array('autofocus')) ?><br/> + <?= $this->task->selectAssignee($users_list, $values, array(), array('autofocus')) ?> <div class="form-actions"> <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/> diff --git a/app/Template/task_creation/form.php b/app/Template/task_creation/form.php index 230706f8..a814219b 100644 --- a/app/Template/task_creation/form.php +++ b/app/Template/task_creation/form.php @@ -48,8 +48,7 @@ <div class="form-column"> <?= $this->form->hidden('project_id', $values) ?> - <?= $this->form->label(t('Assignee'), 'owner_id') ?> - <?= $this->form->select('owner_id', $users_list, $values, $errors, array('tabindex="3"')) ?> + <?= $this->task->selectAssignee($users_list, $values, $errors) ?> <?= $this->form->label(t('Category'), 'category_id') ?> <?= $this->form->select('category_id', $categories_list, $values, $errors, array('tabindex="4"')) ?> diff --git a/app/Template/task_modification/edit_task.php b/app/Template/task_modification/edit_task.php index f825f4a4..1daa318c 100644 --- a/app/Template/task_modification/edit_task.php +++ b/app/Template/task_modification/edit_task.php @@ -44,8 +44,7 @@ <?= $this->form->hidden('id', $values) ?> <?= $this->form->hidden('project_id', $values) ?> - <?= $this->form->label(t('Assignee'), 'owner_id') ?> - <?= $this->form->select('owner_id', $users_list, $values, $errors, array('tabindex="3"')) ?> + <?= $this->task->selectAssignee($users_list, $values, $errors) ?> <?= $this->form->label(t('Category'), 'category_id') ?> <?= $this->form->select('category_id', $categories_list, $values, $errors, array('tabindex="4"')) ?> |