From ef1fea4509a8bd475c9d77ab63764378f1b5067b Mon Sep 17 00:00:00 2001
From: Olivier Maridat <olivier.maridat@trialog.com>
Date: Tue, 10 Mar 2015 14:32:23 +0100
Subject: Add an item "Add a link" in the dropdown menu of a task in the board
 view

---
 app/Template/board/task_menu.php | 1 +
 app/Template/tasklink/create.php | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'app/Template')

diff --git a/app/Template/board/task_menu.php b/app/Template/board/task_menu.php
index bbf12291..35104b66 100644
--- a/app/Template/board/task_menu.php
+++ b/app/Template/board/task_menu.php
@@ -6,6 +6,7 @@
             <li><i class="fa fa-tag"></i> <?= $this->a(t('Change category'), 'board', 'changeCategory', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
             <li><i class="fa fa-align-left"></i> <?= $this->a(t('Change description'), 'task', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
             <li><i class="fa fa-comment-o"></i> <?= $this->a(t('Add a comment'), 'comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
+            <li><i class="fa fa-code-fork"></i> <?= $this->a(t('Add a link'), 'tasklink', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
             <li><i class="fa fa-pencil-square-o"></i> <?= $this->a(t('Edit this task'), 'task', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
             <li><i class="fa fa-close"></i> <?= $this->a(t('Close this task'), 'task', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'redirect' => 'board'), false, 'task-board-popover') ?></li>
         </ul>
diff --git a/app/Template/tasklink/create.php b/app/Template/tasklink/create.php
index fb438cd8..aec3b34a 100644
--- a/app/Template/tasklink/create.php
+++ b/app/Template/tasklink/create.php
@@ -2,7 +2,7 @@
     <h2><?= t('Add a new link') ?></h2>
 </div>
 
-<form action="<?= $this->u('tasklink', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off">
+<form action="<?= $this->u('tasklink', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'ajax' => isset($ajax))) ?>" method="post" autocomplete="off">
 
     <?= $this->formCsrf() ?>
     <?= $this->formHidden('task_id', $values) ?>
@@ -22,6 +22,10 @@
     <div class="form-actions">
         <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
         <?= t('or') ?>
-        <?= $this->a(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+        <?php if (isset($ajax)): ?>
+            <?= $this->a(t('cancel'), 'board', 'show', array('project_id' => $task['project_id'])) ?>
+        <?php else: ?>
+            <?= $this->a(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
+        <?php endif ?>
     </div>
 </form>
\ No newline at end of file
-- 
cgit v1.2.3


From 80fb1ce1e5bd864179fe456a68515b6df5de1cb6 Mon Sep 17 00:00:00 2001
From: Olivier Maridat <olivier.maridat@trialog.com>
Date: Tue, 10 Mar 2015 14:49:10 +0100
Subject: Add a quick task link creation as it is possible for subtask

---
 app/Controller/Task.php        |  1 +
 app/Template/task/show.php     |  2 +-
 app/Template/tasklink/show.php | 22 +++++++++++++++++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)

(limited to 'app/Template')

diff --git a/app/Controller/Task.php b/app/Controller/Task.php
index 741db61e..8e6efc63 100644
--- a/app/Controller/Task.php
+++ b/app/Controller/Task.php
@@ -74,6 +74,7 @@ class Task extends Base
             'links' => $this->taskLink->getLinks($task['id']),
             'task' => $task,
             'values' => $values,
+            'link_label_list' => $this->link->getList(0, false),
             'columns_list' => $this->board->getColumnsList($task['project_id']),
             'colors_list' => $this->color->getList(),
             'date_format' => $this->config->get('application_date_format'),
diff --git a/app/Template/task/show.php b/app/Template/task/show.php
index d51b5542..3b8f808a 100644
--- a/app/Template/task/show.php
+++ b/app/Template/task/show.php
@@ -1,7 +1,7 @@
 <?= $this->render('task/details', array('task' => $task, 'project' => $project)) ?>
 <?= $this->render('task/time', array('task' => $task, 'values' => $values, 'date_format' => $date_format, 'date_formats' => $date_formats)) ?>
 <?= $this->render('task/show_description', array('task' => $task)) ?>
-<?= $this->render('tasklink/show', array('task' => $task, 'links' => $links)) ?>
+<?= $this->render('tasklink/show', array('task' => $task, 'links' => $links, 'link_label_list' => $link_label_list)) ?>
 <?= $this->render('subtask/show', array('task' => $task, 'subtasks' => $subtasks, 'project' => $project)) ?>
 <?= $this->render('task/timesheet', array('task' => $task)) ?>
 <?= $this->render('file/show', array('task' => $task, 'files' => $files)) ?>
diff --git a/app/Template/tasklink/show.php b/app/Template/tasklink/show.php
index a36f89dd..75e3c376 100644
--- a/app/Template/tasklink/show.php
+++ b/app/Template/tasklink/show.php
@@ -41,4 +41,24 @@
     </tr>
     <?php endforeach ?>
 </table>
-<?php endif ?>
\ No newline at end of file
+
+<?php if (! isset($not_editable) && isset($link_label_list)): ?>
+    <form action="<?= $this->u('tasklink', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" method="post" autocomplete="off">
+    
+        <?= $this->formCsrf() ?>
+        <?= $this->formHidden('task_id', array('task_id' => $task['id'])) ?>
+        <?= $this->formHidden('opposite_task_id', array()) ?>
+    
+        <?= $this->formSelect('link_id', $link_label_list, array(), array()) ?>
+    
+        <?= $this->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'])).'"'),
+            'task-autocomplete') ?>
+    
+        <input type="submit" value="<?= t('Add') ?>" class="btn btn-blue"/>
+    </form>
+<?php endif ?>
+<?php endif ?>
-- 
cgit v1.2.3