diff --git a/app/Controller/Board.php b/app/Controller/Board.php index d92436337..f539a77c6 100644 --- a/app/Controller/Board.php +++ b/app/Controller/Board.php @@ -197,7 +197,7 @@ class Board extends Base { $task = $this->getTask(); $this->response->html($this->template->render('board/tasklinks', array( - 'links' => $this->taskLink->getLinks($task['id']), + 'links' => $this->taskLink->getAll($task['id']), 'task' => $task, ))); } diff --git a/app/Controller/Task.php b/app/Controller/Task.php index 5bca45106..866ef7747 100644 --- a/app/Controller/Task.php +++ b/app/Controller/Task.php @@ -36,7 +36,7 @@ class Task extends Base 'project' => $project, 'comments' => $this->comment->getAll($task['id']), 'subtasks' => $this->subtask->getAll($task['id']), - 'links' => $this->taskLink->getLinks($task['id']), + 'links' => $this->taskLink->getAllGroupedByLabel($task['id']), 'task' => $task, 'columns_list' => $this->board->getColumnsList($task['project_id']), 'colors_list' => $this->color->getList(), @@ -72,7 +72,7 @@ class Task extends Base 'images' => $this->file->getAllImages($task['id']), 'comments' => $this->comment->getAll($task['id']), 'subtasks' => $subtasks, - 'links' => $this->taskLink->getLinks($task['id']), + 'links' => $this->taskLink->getAllGroupedByLabel($task['id']), 'task' => $task, 'values' => $values, 'link_label_list' => $this->link->getList(0, false), diff --git a/app/Controller/Tasklink.php b/app/Controller/Tasklink.php index 8376b75b1..eccf149f5 100644 --- a/app/Controller/Tasklink.php +++ b/app/Controller/Tasklink.php @@ -38,13 +38,7 @@ class Tasklink extends Base $task = $this->getTask(); $ajax = $this->request->isAjax() || $this->request->getIntegerParam('ajax'); - if (empty($values)) { - $values = array( - 'task_id' => $task['id'], - ); - } - - if ($ajax) { + if ($ajax && empty($errors)) { $this->response->html($this->template->render('tasklink/create', array( 'values' => $values, 'errors' => $errors, @@ -81,19 +75,72 @@ class Tasklink extends Base if ($this->taskLink->create($values['task_id'], $values['opposite_task_id'], $values['link_id'])) { $this->session->flash(t('Link added successfully.')); + if ($ajax) { $this->response->redirect($this->helper->url('board', 'show', array('project_id' => $task['project_id']))); } + $this->response->redirect($this->helper->url('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])).'#links'); } - else { - $this->session->flashError(t('Unable to create your link.')); - } + + $errors = array('title' => array(t('The exact same link already exists'))); + $this->session->flashError(t('Unable to create your link.')); } $this->create($values, $errors); } + /** + * Edit form + * + * @access public + */ + public function edit(array $values = array(), array $errors = array()) + { + $task = $this->getTask(); + $task_link = $this->getTaskLink(); + + if (empty($values)) { + $opposite_task = $this->taskFinder->getById($task_link['opposite_task_id']); + $values = $task_link; + $values['title'] = '#'.$opposite_task['id'].' - '.$opposite_task['title']; + } + + $this->response->html($this->taskLayout('tasklink/edit', array( + 'values' => $values, + 'errors' => $errors, + 'task_link' => $task_link, + 'task' => $task, + 'labels' => $this->link->getList(0, false), + 'title' => t('Edit link') + ))); + } + + /** + * Validation and update + * + * @access public + */ + public function update() + { + $task = $this->getTask(); + $values = $this->request->getValues(); + + list($valid, $errors) = $this->taskLink->validateModification($values); + + if ($valid) { + + if ($this->taskLink->update($values['id'], $values['task_id'], $values['opposite_task_id'], $values['link_id'])) { + $this->session->flash(t('Link updated successfully.')); + $this->response->redirect($this->helper->url('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])).'#links'); + } + + $this->session->flashError(t('Unable to update your link.')); + } + + $this->edit($values, $errors); + } + /** * Confirmation dialog before removing a link * @@ -127,6 +174,6 @@ class Tasklink extends Base $this->session->flashError(t('Unable to remove this link.')); } - $this->response->redirect($this->helper->url('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))); + $this->response->redirect($this->helper->url('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])).'#links'); } } diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php index f06f87c14..663c2603e 100644 --- a/app/Locale/da_DK/translations.php +++ b/app/Locale/da_DK/translations.php @@ -868,4 +868,8 @@ return array( // 'Help on Sendgrid integration' => '', // 'Disable two factor authentication' => '', // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '', + // 'Edit a link' => '', + // 'Start to type task title...' => '', + // 'A task cannot be linked to itself' => '', + // 'The exact same link already exists' => '', ); diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php index 78c35467c..6efe61676 100644 --- a/app/Locale/de_DE/translations.php +++ b/app/Locale/de_DE/translations.php @@ -868,4 +868,8 @@ return array( 'Help on Sendgrid integration' => 'Hilfe bei Sendgrid-Integration', 'Disable two factor authentication' => 'Deaktiviere Zwei-Faktor-Authentifizierung', 'Do you really want to disable the two factor authentication for this user: "%s"?' => 'Willst du wirklich für folgenden Nutzer die Zwei-Faktor-Authentifizierung deaktivieren: "%s"?', + // 'Edit a link' => '', + // 'Start to type task title...' => '', + // 'A task cannot be linked to itself' => '', + // 'The exact same link already exists' => '', ); diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php index 3edb17d53..449fcd942 100644 --- a/app/Locale/es_ES/translations.php +++ b/app/Locale/es_ES/translations.php @@ -614,7 +614,7 @@ return array( 'Remove a swimlane' => 'Remover un carril', 'Rename' => 'Renombrar', 'Show default swimlane' => 'Mostrar carril por defecto', - 'Swimlane modification for the project "%s"' => '', + // 'Swimlane modification for the project "%s"' => '', 'Swimlane not found.' => 'Carril no encontrado', 'Swimlane removed successfully.' => 'Carril removido correctamente', 'Swimlanes' => 'Carriles', @@ -653,7 +653,7 @@ return array( 'Filter by status' => 'Filtrar por estado', 'Calendar' => 'Calendario', 'Next' => 'Siguiente', - '#%d' => '', + // '#%d' => '', 'Filter by color' => 'Filtrar por color', 'Filter by swimlane' => 'Filtrar por carril', 'All swimlanes' => 'Todos los carriles', @@ -846,8 +846,8 @@ return array( 'Secret key: ' => 'Clave secreta: ', 'Test your device' => 'Probar tu dispositivo', 'Assign a color when the task is moved to a specific column' => 'Asignar un color al mover la tarea a una columna específica', - '%s via Kanboard' => '%s vía Kanboard', - 'uploaded by: %s' => 'cargado por: %s', + '%s via Kanboard' => '%s vía Kanboard', + 'uploaded by: %s' => 'cargado por: %s', 'uploaded on: %s' => 'cargado en: %s', 'size: %s' => 'tamaño: %s', 'Burndown chart for "%s"' => 'Trabajo pendiente para "%s"', @@ -868,5 +868,8 @@ return array( 'Help on Sendgrid integration' => 'Ayuda sobre la integración con Sendgrid', 'Disable two factor authentication' => 'Desactivar la autenticación de dos factores', 'Do you really want to disable the two factor authentication for this user: "%s"?' => '¿Realmentes quieres desactuvar la autenticación de dos factores para este usuario: "%s?"', + // 'Edit a link' => '', + // 'Start to type task title...' => '', + // 'A task cannot be linked to itself' => '', + // 'The exact same link already exists' => '', ); - diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php index 9ca386d6b..15c919ed4 100644 --- a/app/Locale/fi_FI/translations.php +++ b/app/Locale/fi_FI/translations.php @@ -868,4 +868,8 @@ return array( // 'Help on Sendgrid integration' => '', // 'Disable two factor authentication' => '', // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '', + // 'Edit a link' => '', + // 'Start to type task title...' => '', + // 'A task cannot be linked to itself' => '', + // 'The exact same link already exists' => '', ); diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php index c05dd689d..84a28207f 100644 --- a/app/Locale/fr_FR/translations.php +++ b/app/Locale/fr_FR/translations.php @@ -719,7 +719,7 @@ return array( 'is a child of' => 'est un enfant de', 'is a parent of' => 'est un parent de', 'targets milestone' => 'vise l\'étape importante', - 'is a milestone of' => 'est une étape importante de', + 'is a milestone of' => 'est une étape importante incluant', 'fixes' => 'corrige', 'is fixed by' => 'est corrigée par', 'This task' => 'Cette tâche', @@ -870,4 +870,8 @@ return array( 'Help on Sendgrid integration' => 'Aide sur l\'intégration avec Sendgrid', 'Disable two factor authentication' => 'Désactiver l\'authentification à deux facteurs', 'Do you really want to disable the two factor authentication for this user: "%s"?' => 'Voulez-vous vraiment désactiver l\'authentification à deux facteurs pour cet utilisateur : « %s » ?', + 'Edit a link' => 'Modifier un lien', + 'Start to type task title...' => 'Tappez le titre de la tâche...', + 'A task cannot be linked to itself' => 'Une tâche ne peut être liée à elle-même', + 'The exact same link already exists' => 'Un lien identique existe déjà', ); diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php index f07b691c2..26b1e132d 100644 --- a/app/Locale/hu_HU/translations.php +++ b/app/Locale/hu_HU/translations.php @@ -868,4 +868,8 @@ return array( // 'Help on Sendgrid integration' => '', // 'Disable two factor authentication' => '', // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '', + // 'Edit a link' => '', + // 'Start to type task title...' => '', + // 'A task cannot be linked to itself' => '', + // 'The exact same link already exists' => '', ); diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php index 0ccefe552..8736572e9 100644 --- a/app/Locale/it_IT/translations.php +++ b/app/Locale/it_IT/translations.php @@ -868,4 +868,8 @@ return array( // 'Help on Sendgrid integration' => '', // 'Disable two factor authentication' => '', // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '', + // 'Edit a link' => '', + // 'Start to type task title...' => '', + // 'A task cannot be linked to itself' => '', + // 'The exact same link already exists' => '', ); diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php index 644dcfa76..fa047f698 100644 --- a/app/Locale/ja_JP/translations.php +++ b/app/Locale/ja_JP/translations.php @@ -868,4 +868,8 @@ return array( // 'Help on Sendgrid integration' => '', // 'Disable two factor authentication' => '', // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '', + // 'Edit a link' => '', + // 'Start to type task title...' => '', + // 'A task cannot be linked to itself' => '', + // 'The exact same link already exists' => '', ); diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php index e0285fdd5..eecdaa9fc 100644 --- a/app/Locale/nl_NL/translations.php +++ b/app/Locale/nl_NL/translations.php @@ -868,4 +868,8 @@ return array( // 'Help on Sendgrid integration' => '', // 'Disable two factor authentication' => '', // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '', + // 'Edit a link' => '', + // 'Start to type task title...' => '', + // 'A task cannot be linked to itself' => '', + // 'The exact same link already exists' => '', ); diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php index 39c92379e..a38717234 100644 --- a/app/Locale/pl_PL/translations.php +++ b/app/Locale/pl_PL/translations.php @@ -868,4 +868,8 @@ return array( // 'Help on Sendgrid integration' => '', // 'Disable two factor authentication' => '', // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '', + // 'Edit a link' => '', + // 'Start to type task title...' => '', + // 'A task cannot be linked to itself' => '', + // 'The exact same link already exists' => '', ); diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php index 04d3138ff..3e1ddd139 100644 --- a/app/Locale/pt_BR/translations.php +++ b/app/Locale/pt_BR/translations.php @@ -868,4 +868,8 @@ return array( 'Help on Sendgrid integration' => 'Ajuda na integração do Sendgrid', 'Disable two factor authentication' => 'Desativar autenticação à dois fatores', 'Do you really want to disable the two factor authentication for this user: "%s"?' => 'Você deseja realmente desativar a autenticação à dois fatores para esse usuário: "%s"?', + // 'Edit a link' => '', + // 'Start to type task title...' => '', + // 'A task cannot be linked to itself' => '', + // 'The exact same link already exists' => '', ); diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php index c119b5649..4787d2c3c 100644 --- a/app/Locale/ru_RU/translations.php +++ b/app/Locale/ru_RU/translations.php @@ -868,4 +868,8 @@ return array( // 'Help on Sendgrid integration' => '', 'Disable two factor authentication' => 'Выключить двухфакторную авторизацию', 'Do you really want to disable the two factor authentication for this user: "%s"?' => 'Вы действительно хотите выключить двухфакторную авторизацию для пользователя "%s"?', + // 'Edit a link' => '', + // 'Start to type task title...' => '', + // 'A task cannot be linked to itself' => '', + // 'The exact same link already exists' => '', ); diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php index 7dcb6f990..b74be22ff 100644 --- a/app/Locale/sr_Latn_RS/translations.php +++ b/app/Locale/sr_Latn_RS/translations.php @@ -868,4 +868,8 @@ return array( // 'Help on Sendgrid integration' => '', // 'Disable two factor authentication' => '', // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '', + // 'Edit a link' => '', + // 'Start to type task title...' => '', + // 'A task cannot be linked to itself' => '', + // 'The exact same link already exists' => '', ); diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php index f3d586965..f56369251 100644 --- a/app/Locale/sv_SE/translations.php +++ b/app/Locale/sv_SE/translations.php @@ -868,4 +868,8 @@ return array( // 'Help on Sendgrid integration' => '', // 'Disable two factor authentication' => '', // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '', + // 'Edit a link' => '', + // 'Start to type task title...' => '', + // 'A task cannot be linked to itself' => '', + // 'The exact same link already exists' => '', ); diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php index 552e2f430..1e1d81d92 100644 --- a/app/Locale/th_TH/translations.php +++ b/app/Locale/th_TH/translations.php @@ -868,4 +868,8 @@ return array( // 'Help on Sendgrid integration' => '', // 'Disable two factor authentication' => '', // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '', + // 'Edit a link' => '', + // 'Start to type task title...' => '', + // 'A task cannot be linked to itself' => '', + // 'The exact same link already exists' => '', ); diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php index e4efe2583..5bd66e4a3 100644 --- a/app/Locale/tr_TR/translations.php +++ b/app/Locale/tr_TR/translations.php @@ -868,4 +868,8 @@ return array( // 'Help on Sendgrid integration' => '', // 'Disable two factor authentication' => '', // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '', + // 'Edit a link' => '', + // 'Start to type task title...' => '', + // 'A task cannot be linked to itself' => '', + // 'The exact same link already exists' => '', ); diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php index a51a54d37..8a7c5e42a 100644 --- a/app/Locale/zh_CN/translations.php +++ b/app/Locale/zh_CN/translations.php @@ -868,4 +868,8 @@ return array( // 'Help on Sendgrid integration' => '', // 'Disable two factor authentication' => '', // 'Do you really want to disable the two factor authentication for this user: "%s"?' => '', + // 'Edit a link' => '', + // 'Start to type task title...' => '', + // 'A task cannot be linked to itself' => '', + // 'The exact same link already exists' => '', ); diff --git a/app/Model/TaskLink.php b/app/Model/TaskLink.php index 623913710..7b696afcd 100644 --- a/app/Model/TaskLink.php +++ b/app/Model/TaskLink.php @@ -34,6 +34,24 @@ class TaskLink extends Base return $this->db->table(self::TABLE)->eq('id', $task_link_id)->findOne(); } + /** + * Get the opposite task link (use the unique index task_has_links_unique) + * + * @access public + * @param array $task_link + * @return array + */ + public function getOppositeTaskLink(array $task_link) + { + $opposite_link_id = $this->link->getOppositeLinkId($task_link['link_id']); + + return $this->db->table(self::TABLE) + ->eq('opposite_task_id', $task_link['task_id']) + ->eq('task_id', $task_link['opposite_task_id']) + ->eq('link_id', $opposite_link_id) + ->findOne(); + } + /** * Get all links attached to a task * @@ -41,7 +59,7 @@ class TaskLink extends Base * @param integer $task_id Task id * @return array */ - public function getLinks($task_id) + public function getAll($task_id) { return $this->db ->table(self::TABLE) @@ -52,16 +70,46 @@ class TaskLink extends Base Task::TABLE.'.title', Task::TABLE.'.is_active', Task::TABLE.'.project_id', + Task::TABLE.'.time_spent AS task_time_spent', + Task::TABLE.'.time_estimated AS task_time_estimated', + Task::TABLE.'.owner_id AS task_assignee_id', + User::TABLE.'.username AS task_assignee_username', + User::TABLE.'.name AS task_assignee_name', Board::TABLE.'.title AS column_title' ) ->eq(self::TABLE.'.task_id', $task_id) ->join(Link::TABLE, 'id', 'link_id') ->join(Task::TABLE, 'id', 'opposite_task_id') ->join(Board::TABLE, 'id', 'column_id', Task::TABLE) + ->join(User::TABLE, 'id', 'owner_id', Task::TABLE) ->orderBy(Link::TABLE.'.id ASC, '.Board::TABLE.'.position ASC, '.Task::TABLE.'.is_active DESC, '.Task::TABLE.'.id', Table::SORT_ASC) ->findAll(); } + /** + * Get all links attached to a task grouped by label + * + * @access public + * @param integer $task_id Task id + * @return array + */ + public function getAllGroupedByLabel($task_id) + { + $links = $this->getAll($task_id); + $result = array(); + + foreach ($links as $link) { + + if (! isset($result[$link['label']])) { + $result[$link['label']] = array(); + } + + $result[$link['label']][] = $link; + } + + return $result; + } + /** * Create a new link * @@ -69,31 +117,76 @@ class TaskLink extends Base * @param integer $task_id Task id * @param integer $opposite_task_id Opposite task id * @param integer $link_id Link id - * @return boolean + * @return integer Task link id */ public function create($task_id, $opposite_task_id, $link_id) { $this->db->startTransaction(); - // Create the original link + // Get opposite link + $opposite_link_id = $this->link->getOppositeLinkId($link_id); + + // Create the original task link $this->db->table(self::TABLE)->insert(array( 'task_id' => $task_id, 'opposite_task_id' => $opposite_task_id, 'link_id' => $link_id, )); - $link_id = $this->link->getOppositeLinkId($link_id); + $task_link_id = $this->db->getConnection()->getLastId(); - // Create the opposite link + // Create the opposite task link $this->db->table(self::TABLE)->insert(array( 'task_id' => $opposite_task_id, 'opposite_task_id' => $task_id, - 'link_id' => $link_id, + 'link_id' => $opposite_link_id, )); $this->db->closeTransaction(); - return true; + return $task_link_id; + } + + /** + * Update a task link + * + * @access public + * @param integer $task_link_id Task link id + * @param integer $task_id Task id + * @param integer $opposite_task_id Opposite task id + * @param integer $link_id Link id + * @return boolean + */ + public function update($task_link_id, $task_id, $opposite_task_id, $link_id) + { + $this->db->startTransaction(); + + // Get original task link + $task_link = $this->getById($task_link_id); + + // Find opposite task link + $opposite_task_link = $this->getOppositeTaskLink($task_link); + + // Get opposite link + $opposite_link_id = $this->link->getOppositeLinkId($link_id); + + // Update the original task link + $rs1 = $this->db->table(self::TABLE)->eq('id', $task_link_id)->update(array( + 'task_id' => $task_id, + 'opposite_task_id' => $opposite_task_id, + 'link_id' => $link_id, + )); + + // Update the opposite link + $rs2 = $this->db->table(self::TABLE)->eq('id', $opposite_task_link['id'])->update(array( + 'task_id' => $opposite_task_id, + 'opposite_task_id' => $task_id, + 'link_id' => $opposite_link_id, + )); + + $this->db->closeTransaction(); + + return $rs1 && $rs2; } /** @@ -123,6 +216,23 @@ class TaskLink extends Base return true; } + /** + * Common validation rules + * + * @access private + * @return array + */ + private function commonValidationRules() + { + return array( + new Validators\Required('task_id', t('Field required')), + new Validators\Required('opposite_task_id', t('Field required')), + new Validators\Required('link_id', t('Field required')), + new Validators\NotEquals('opposite_task_id', 'task_id', t('A task cannot be linked to itself')), + new Validators\Exists('opposite_task_id', t('This linked task id doesn\'t exists'), $this->db->getConnection(), Task::TABLE, 'id') + ); + } + /** * Validate creation * @@ -132,11 +242,28 @@ class TaskLink extends Base */ public function validateCreation(array $values) { - $v = new Validator($values, array( - new Validators\Required('task_id', t('Field required')), - new Validators\Required('link_id', t('Field required')), - new Validators\Required('title', t('Field required')), - )); + $v = new Validator($values, $this->commonValidationRules()); + + return array( + $v->execute(), + $v->getErrors() + ); + } + + /** + * Validate modification + * + * @access public + * @param array $values Form values + * @return array $valid, $errors [0] = Success or not, [1] = List of errors + */ + public function validateModification(array $values) + { + $rules = array( + new Validators\Required('id', t('Field required')), + ); + + $v = new Validator($values, array_merge($rules, $this->commonValidationRules())); return array( $v->execute(), diff --git a/app/Template/board/tasklinks.php b/app/Template/board/tasklinks.php index 9c4f52ca5..f934cff97 100644 --- a/app/Template/board/tasklinks.php +++ b/app/Template/board/tasklinks.php @@ -9,6 +9,9 @@ false, $link['is_active'] ? '' : 'task-link-closed' ) ?> + + [e($link['task_assignee_name'] ?: $link['task_assignee_username']) ?>] + diff --git a/app/Template/tasklink/create.php b/app/Template/tasklink/create.php index acf9d6d1c..3394271a3 100644 --- a/app/Template/tasklink/create.php +++ b/app/Template/tasklink/create.php @@ -5,7 +5,7 @@
formCsrf() ?> - formHidden('task_id', $values) ?> + formHidden('task_id', array('task_id' => $task['id'])) ?> formHidden('opposite_task_id', $values) ?> formLabel(t('Label'), 'link_id') ?> @@ -16,7 +16,13 @@ 'title', $values, $errors, - array('required', 'data-dst-field="opposite_task_id"', 'data-search-url="'.$this->u('app', 'autocomplete', array('exclude_task_id' => $task['id'])).'"'), + array( + 'required', + 'placeholder="'.t('Start to type task title...').'"', + 'title="'.t('Start to type task title...').'"', + 'data-dst-field="opposite_task_id"', + 'data-search-url="'.$this->u('app', 'autocomplete', array('exclude_task_id' => $task['id'])).'"', + ), 'task-autocomplete') ?>
diff --git a/app/Template/tasklink/edit.php b/app/Template/tasklink/edit.php new file mode 100644 index 000000000..267bd6273 --- /dev/null +++ b/app/Template/tasklink/edit.php @@ -0,0 +1,34 @@ +
+

+
+ + + + formCsrf() ?> + formHidden('id', $values) ?> + formHidden('task_id', $values) ?> + formHidden('opposite_task_id', $values) ?> + + formLabel(t('Label'), 'link_id') ?> + formSelect('link_id', $labels, $values, $errors) ?> + + formLabel(t('Task'), 'title') ?> + formText( + 'title', + $values, + $errors, + array( + 'required', + 'placeholder="'.t('Start to type task title...').'"', + 'title="'.t('Start to type task title...').'"', + 'data-dst-field="opposite_task_id"', + 'data-search-url="'.$this->u('app', 'autocomplete', array('exclude_task_id' => $task['id'])).'"', + ), + 'task-autocomplete') ?> + +
+ + + a(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> +
+ \ No newline at end of file diff --git a/app/Template/tasklink/show.php b/app/Template/tasklink/show.php index 75e3c3763..d4a3939bb 100644 --- a/app/Template/tasklink/show.php +++ b/app/Template/tasklink/show.php @@ -2,63 +2,103 @@

- + - - - + + + + - - - - + $grouped_links): ?> + + + + + + + + - + - - - + + +
- + formCsrf() ?> formHidden('task_id', array('task_id' => $task['id'])) ?> formHidden('opposite_task_id', array()) ?> - + formSelect('link_id', $link_label_list, array(), array()) ?> - + formText( 'title', array(), array(), - array('required', 'data-dst-field="opposite_task_id"', 'data-search-url="'.$this->u('app', 'autocomplete', array('exclude_task_id' => $task['id'])).'"'), + array( + 'required', + 'placeholder="'.t('Start to type task title...').'"', + 'title="'.t('Start to type task title...').'"', + 'data-dst-field="opposite_task_id"', + 'data-search-url="'.$this->u('app', 'autocomplete', array('exclude_task_id' => $task['id'])).'"', + ), 'task-autocomplete') ?> - +
+ diff --git a/assets/css/app.css b/assets/css/app.css index 23b475e88..7ab009a57 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -767,7 +767,7 @@ nav .active a { } .public-task { - max-width: 700px; + max-width: 800px; margin: 0 auto; margin-top: 5px; } diff --git a/assets/css/print.css b/assets/css/print.css index b2cbfb644..3069b1942 100644 --- a/assets/css/print.css +++ b/assets/css/print.css @@ -157,7 +157,7 @@ th a:hover { } .public-task { - max-width: 700px; + max-width: 800px; margin: 0 auto; margin-top: 5px; } diff --git a/assets/css/src/board.css b/assets/css/src/board.css index 630594c0b..75df51694 100644 --- a/assets/css/src/board.css +++ b/assets/css/src/board.css @@ -13,7 +13,7 @@ } .public-task { - max-width: 700px; + max-width: 800px; margin: 0 auto; margin-top: 5px; } diff --git a/assets/js/app.js b/assets/js/app.js index 36b9614e3..6ba7d7c99 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -142,8 +142,8 @@ return""!=a?"visible"==document[a]:!0},SetStorageItem:function(a,c){"undefined"! c.parent().addClass("form-tab-selected");e.find(".markdown").html(a);e.css("height",f.css("height"));e.css("width",f.css("width"));d.hide();e.show()})},MarkdownWriter:function(a){a.preventDefault();$(this).closest("ul").find("li").removeClass("form-tab-selected");$(this).parent().addClass("form-tab-selected");$(".write-area").show();$(".preview-area").hide()},CheckSession:function(){$(".form-login").length||$.ajax({cache:!1,url:$("body").data("status-url"),statusCode:{401:function(){window.location= $("body").data("login-url")}}})},Init:function(){$("#board-selector").chosen({width:180,no_results_text:$("#board-selector").data("notfound")});$("#board-selector").change(function(){window.location=$(this).attr("data-board-url").replace(/PROJECT_ID/g,$(this).val())});window.setInterval(Kanboard.CheckSession,6E4);Mousetrap.bindGlobal("mod+enter",function(){$("form").submit()});Mousetrap.bind("b",function(a){a.preventDefault();$("#board-selector").trigger("chosen:open")});$.datepicker.setDefaults($.datepicker.regional[$("body").data("js-lang")]); Kanboard.InitAfterAjax()},InitAfterAjax:function(){$(document).on("click",".popover",Kanboard.Popover);$("[autofocus]").each(function(a,c){$(this).focus()});$(".form-date").datepicker({showOtherMonths:!0,selectOtherMonths:!0,dateFormat:"yy-mm-dd",constrainInput:!1});$("#markdown-preview").click(Kanboard.MarkdownPreview);$("#markdown-write").click(Kanboard.MarkdownWriter);$(".auto-select").focus(function(){$(this).select()});$(".dropit-submenu").hide();$(".dropdown").not(".dropit").dropit({triggerParentEl:"span"}); -$(".task-autocomplete").length&&($(".task-autocomplete").parent().find("input[type=submit]").attr("disabled","disabled"),$(".task-autocomplete").autocomplete({source:$(".task-autocomplete").data("search-url"),minLength:2,select:function(a,c){var b=$(".task-autocomplete").data("dst-field");$("input[name="+b+"]").val(c.item.id);$(".task-autocomplete").parent().find("input[type=submit]").removeAttr("disabled")}}));$(".column-tooltip").tooltip({content:function(){return'
'+$(this).attr("title")+ -"
"},position:{my:"left-20 top",at:"center bottom+9",using:function(a,c){$(this).css(a);var b=c.target.left+c.target.width/2-c.element.left-20;$("
").addClass("tooltip-arrow").addClass(c.vertical).addClass(0==b?"align-left":"align-right").appendTo(this)}}});Kanboard.Exists("screenshot-zone")&&Kanboard.Screenshot.Init()}}}(); +$(".task-autocomplete").length&&(""==$(".opposite_task_id").val()&&$(".task-autocomplete").parent().find("input[type=submit]").attr("disabled","disabled"),$(".task-autocomplete").autocomplete({source:$(".task-autocomplete").data("search-url"),minLength:2,select:function(a,c){var b=$(".task-autocomplete").data("dst-field");$("input[name="+b+"]").val(c.item.id);$(".task-autocomplete").parent().find("input[type=submit]").removeAttr("disabled")}}));$(".column-tooltip").tooltip({content:function(){return'
'+ +$(this).attr("title")+"
"},position:{my:"left-20 top",at:"center bottom+9",using:function(a,c){$(this).css(a);var b=c.target.left+c.target.width/2-c.element.left-20;$("
").addClass("tooltip-arrow").addClass(c.vertical).addClass(0==b?"align-left":"align-right").appendTo(this)}}});Kanboard.Exists("screenshot-zone")&&Kanboard.Screenshot.Init()}}}(); Kanboard.Board=function(){function a(a){a.preventDefault();a.stopPropagation();Kanboard.Popover(a,Kanboard.InitAfterAjax)}function c(){Mousetrap.bind("n",function(){Kanboard.OpenPopover($("#board").data("task-creation-url"),Kanboard.InitAfterAjax)});Mousetrap.bind("s",function(){"expanded"===(Kanboard.GetStorageItem(d())||"expanded")?(e(),Kanboard.SetStorageItem(d(),"collapsed")):(f(),Kanboard.SetStorageItem(d(),"expanded"))});Mousetrap.bind("c",function(){q()})}function b(){$(".filter-expand-link").click(function(a){a.preventDefault(); f();Kanboard.SetStorageItem(d(),"expanded")});$(".filter-collapse-link").click(function(a){a.preventDefault();e();Kanboard.SetStorageItem(d(),"collapsed")});g()}function d(){return"board_stacking_"+$("#board").data("project-id")}function e(){$(".filter-collapse").hide();$(".task-board-collapsed").show();$(".filter-expand").show();$(".task-board-expanded").hide()}function f(){$(".filter-collapse").show();$(".task-board-collapsed").hide();$(".filter-expand").hide();$(".task-board-expanded").show()} function g(){"expanded"===(Kanboard.GetStorageItem(d())||"expanded")?f():e()}function h(){$(".column").sortable({delay:300,distance:5,connectWith:".column",placeholder:"draggable-placeholder",stop:function(a,b){k(b.item.attr("data-task-id"),b.item.parent().attr("data-column-id"),b.item.index()+1,b.item.parent().attr("data-swimlane-id"))}});$("#board").on("click",".task-board-popover",a);$("#board").on("click",".task-board",function(){window.location=$(this).data("task-url")});$(".task-board-tooltip").tooltip({track:!1, diff --git a/assets/js/src/base.js b/assets/js/src/base.js index 9c884aea2..9b1e1b7da 100644 --- a/assets/js/src/base.js +++ b/assets/js/src/base.js @@ -227,7 +227,10 @@ var Kanboard = (function() { // Task auto-completion if ($(".task-autocomplete").length) { - $(".task-autocomplete").parent().find("input[type=submit]").attr('disabled','disabled'); + + if ($('.opposite_task_id').val() == '') { + $(".task-autocomplete").parent().find("input[type=submit]").attr('disabled','disabled'); + } $(".task-autocomplete").autocomplete({ source: $(".task-autocomplete").data("search-url"), diff --git a/tests/units/TaskLinkTest.php b/tests/units/TaskLinkTest.php index b78ffd281..e213e25ac 100644 --- a/tests/units/TaskLinkTest.php +++ b/tests/units/TaskLinkTest.php @@ -18,9 +18,9 @@ class TaskLinkTest extends Base $this->assertEquals(1, $p->create(array('name' => 'test'))); $this->assertEquals(1, $tc->create(array('project_id' => 1, 'title' => 'A'))); $this->assertEquals(2, $tc->create(array('project_id' => 1, 'title' => 'B'))); - $this->assertTrue($tl->create(1, 2, 1)); + $this->assertEquals(1, $tl->create(1, 2, 1)); - $links = $tl->getLinks(1); + $links = $tl->getAll(1); $this->assertNotEmpty($links); $this->assertCount(1, $links); $this->assertEquals('relates to', $links[0]['label']); @@ -28,13 +28,27 @@ class TaskLinkTest extends Base $this->assertEquals(2, $links[0]['task_id']); $this->assertEquals(1, $links[0]['is_active']); - $links = $tl->getLinks(2); + $links = $tl->getAll(2); $this->assertNotEmpty($links); $this->assertCount(1, $links); $this->assertEquals('relates to', $links[0]['label']); $this->assertEquals('A', $links[0]['title']); $this->assertEquals(1, $links[0]['task_id']); $this->assertEquals(1, $links[0]['is_active']); + + $task_link = $tl->getById(1); + $this->assertNotEmpty($task_link); + $this->assertEquals(1, $task_link['id']); + $this->assertEquals(1, $task_link['task_id']); + $this->assertEquals(2, $task_link['opposite_task_id']); + $this->assertEquals(1, $task_link['link_id']); + + $opposite_task_link = $tl->getOppositeTaskLink($task_link); + $this->assertNotEmpty($opposite_task_link); + $this->assertEquals(2, $opposite_task_link['id']); + $this->assertEquals(2, $opposite_task_link['task_id']); + $this->assertEquals(1, $opposite_task_link['opposite_task_id']); + $this->assertEquals(1, $opposite_task_link['link_id']); } public function testCreateTaskLinkWithOpposite() @@ -46,9 +60,9 @@ class TaskLinkTest extends Base $this->assertEquals(1, $p->create(array('name' => 'test'))); $this->assertEquals(1, $tc->create(array('project_id' => 1, 'title' => 'A'))); $this->assertEquals(2, $tc->create(array('project_id' => 1, 'title' => 'B'))); - $this->assertTrue($tl->create(1, 2, 2)); + $this->assertEquals(1, $tl->create(1, 2, 2)); - $links = $tl->getLinks(1); + $links = $tl->getAll(1); $this->assertNotEmpty($links); $this->assertCount(1, $links); $this->assertEquals('blocks', $links[0]['label']); @@ -56,13 +70,60 @@ class TaskLinkTest extends Base $this->assertEquals(2, $links[0]['task_id']); $this->assertEquals(1, $links[0]['is_active']); - $links = $tl->getLinks(2); + $links = $tl->getAll(2); $this->assertNotEmpty($links); $this->assertCount(1, $links); $this->assertEquals('is blocked by', $links[0]['label']); $this->assertEquals('A', $links[0]['title']); $this->assertEquals(1, $links[0]['task_id']); $this->assertEquals(1, $links[0]['is_active']); + + $task_link = $tl->getById(1); + $this->assertNotEmpty($task_link); + $this->assertEquals(1, $task_link['id']); + $this->assertEquals(1, $task_link['task_id']); + $this->assertEquals(2, $task_link['opposite_task_id']); + $this->assertEquals(2, $task_link['link_id']); + + $opposite_task_link = $tl->getOppositeTaskLink($task_link); + $this->assertNotEmpty($opposite_task_link); + $this->assertEquals(2, $opposite_task_link['id']); + $this->assertEquals(2, $opposite_task_link['task_id']); + $this->assertEquals(1, $opposite_task_link['opposite_task_id']); + $this->assertEquals(3, $opposite_task_link['link_id']); + } + + public function testUpdate() + { + $tl = new TaskLink($this->container); + $p = new Project($this->container); + $tc = new TaskCreation($this->container); + + $this->assertEquals(1, $p->create(array('name' => 'test1'))); + $this->assertEquals(2, $p->create(array('name' => 'test2'))); + $this->assertEquals(1, $tc->create(array('project_id' => 1, 'title' => 'A'))); + $this->assertEquals(2, $tc->create(array('project_id' => 2, 'title' => 'B'))); + $this->assertEquals(3, $tc->create(array('project_id' => 1, 'title' => 'C'))); + + $this->assertEquals(1, $tl->create(1, 2, 5)); + $this->assertTrue($tl->update(1, 1, 3, 11)); + + $links = $tl->getAll(1); + $this->assertNotEmpty($links); + $this->assertCount(1, $links); + $this->assertEquals('is fixed by', $links[0]['label']); + $this->assertEquals('C', $links[0]['title']); + $this->assertEquals(3, $links[0]['task_id']); + + $links = $tl->getAll(2); + $this->assertEmpty($links); + + $links = $tl->getAll(3); + $this->assertNotEmpty($links); + $this->assertCount(1, $links); + $this->assertEquals('fixes', $links[0]['label']); + $this->assertEquals('A', $links[0]['title']); + $this->assertEquals(1, $links[0]['task_id']); } public function testRemove() @@ -74,35 +135,51 @@ class TaskLinkTest extends Base $this->assertEquals(1, $p->create(array('name' => 'test'))); $this->assertEquals(1, $tc->create(array('project_id' => 1, 'title' => 'A'))); $this->assertEquals(2, $tc->create(array('project_id' => 1, 'title' => 'B'))); - $this->assertTrue($tl->create(1, 2, 2)); + $this->assertEquals(1, $tl->create(1, 2, 2)); - $links = $tl->getLinks(1); + $links = $tl->getAll(1); $this->assertNotEmpty($links); - $links = $tl->getLinks(2); + $links = $tl->getAll(2); $this->assertNotEmpty($links); $this->assertTrue($tl->remove($links[0]['id'])); - $links = $tl->getLinks(1); + $links = $tl->getAll(1); $this->assertEmpty($links); - $links = $tl->getLinks(2); + $links = $tl->getAll(2); $this->assertEmpty($links); } public function testValidation() { $tl = new TaskLink($this->container); + $p = new Project($this->container); + $tc = new TaskCreation($this->container); - $r = $tl->validateCreation(array('task_id' => 1, 'link_id' => 1, 'title' => 'a')); + $this->assertEquals(1, $p->create(array('name' => 'test'))); + $this->assertEquals(1, $tc->create(array('project_id' => 1, 'title' => 'A'))); + $this->assertEquals(2, $tc->create(array('project_id' => 1, 'title' => 'B'))); + + $links = $tl->getAll(1); + $this->assertEmpty($links); + + $links = $tl->getAll(2); + $this->assertEmpty($links); + + // Check validation + $r = $tl->validateCreation(array('task_id' => 1, 'link_id' => 1, 'opposite_task_id' => 2)); $this->assertTrue($r[0]); $r = $tl->validateCreation(array('task_id' => 1, 'link_id' => 1)); $this->assertFalse($r[0]); - $r = $tl->validateCreation(array('task_id' => 1, 'title' => 'a')); + $r = $tl->validateCreation(array('task_id' => 1, 'opposite_task_id' => 2)); $this->assertFalse($r[0]); - $r = $tl->validateCreation(array('link_id' => 1, 'title' => 'a')); + $r = $tl->validateCreation(array('task_id' => 1, 'opposite_task_id' => 2)); + $this->assertFalse($r[0]); + + $r = $tl->validateCreation(array('task_id' => 1, 'link_id' => 1, 'opposite_task_id' => 1)); $this->assertFalse($r[0]); } }