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/Controller/Tasklink.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'app/Controller')

diff --git a/app/Controller/Tasklink.php b/app/Controller/Tasklink.php
index 61b7fab8..59ce0433 100644
--- a/app/Controller/Tasklink.php
+++ b/app/Controller/Tasklink.php
@@ -36,6 +36,7 @@ class Tasklink extends Base
     public function create(array $values = array(), array $errors = array())
     {
         $task = $this->getTask();
+        $ajax = $this->request->isAjax() || $this->request->getIntegerParam('ajax');
 
         if (empty($values)) {
             $values = array(
@@ -43,6 +44,17 @@ class Tasklink extends Base
             );
         }
 
+        if ($ajax) {
+            $this->response->html($this->template->render('tasklink/create', array(
+                'values' => $values,
+                'errors' => $errors,
+                'task' => $task,
+                'labels' => $this->link->getList(0, false),
+                'title' => t('Add a new link'),
+                'ajax' => $ajax,
+            )));
+        }
+
         $this->response->html($this->taskLayout('tasklink/create', array(
             'values' => $values,
             'errors' => $errors,
@@ -61,6 +73,7 @@ class Tasklink extends Base
     {
         $task = $this->getTask();
         $values = $this->request->getValues();
+        $ajax = $this->request->isAjax() || $this->request->getIntegerParam('ajax');
 
         list($valid, $errors) = $this->taskLink->validateCreation($values);
 
@@ -68,6 +81,9 @@ 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 {
-- 
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/Controller')

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