From eca069dbd1318274b4170eb78629b0128dd0543c Mon Sep 17 00:00:00 2001
From: "Dzial Techniczny WMW Projekt s.c" <techniczna@wmwprojekt.pl>
Date: Wed, 8 Apr 2020 10:27:04 +0200
Subject: Display project name in subtask list task title - fixes #108

---
 app/Template/dashboard/overview.php   | 1 +
 app/Template/dashboard/subtasks.php   | 1 +
 app/Template/dashboard/tasks.php      | 1 +
 app/Template/search/results.php       | 3 ++-
 app/Template/task_list/listing.php    | 1 +
 app/Template/task_list/task_title.php | 2 +-
 6 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'app/Template')

diff --git a/app/Template/dashboard/overview.php b/app/Template/dashboard/overview.php
index a352ce02..af3c6261 100644
--- a/app/Template/dashboard/overview.php
+++ b/app/Template/dashboard/overview.php
@@ -64,6 +64,7 @@
                         <?= $this->render('task_list/task_title', array(
                             'task' => $task,
                             'redirect' => 'dashboard',
+                            'is_subtask' => FALSE
                         )) ?>
 
                         <?= $this->render('task_list/task_details', array(
diff --git a/app/Template/dashboard/subtasks.php b/app/Template/dashboard/subtasks.php
index 96bb13cc..7a422786 100644
--- a/app/Template/dashboard/subtasks.php
+++ b/app/Template/dashboard/subtasks.php
@@ -35,6 +35,7 @@
             <div class="table-list-row color-<?= $task['color_id'] ?>">
                 <?= $this->render('task_list/task_title', array(
                     'task' => $task,
+                    'is_subtask' => TRUE
                 )) ?>
 
                 <?= $this->render('task_list/task_subtasks', array(
diff --git a/app/Template/dashboard/tasks.php b/app/Template/dashboard/tasks.php
index 4392e40b..4aa4e127 100644
--- a/app/Template/dashboard/tasks.php
+++ b/app/Template/dashboard/tasks.php
@@ -14,6 +14,7 @@
                 <?= $this->render('task_list/task_title', array(
                     'task' => $task,
                     'redirect' => 'dashboard-tasks',
+                    'is_subtask' => FALSE
                 )) ?>
 
                 <?= $this->render('task_list/task_details', array(
diff --git a/app/Template/search/results.php b/app/Template/search/results.php
index 85b09ea9..d8ca671e 100644
--- a/app/Template/search/results.php
+++ b/app/Template/search/results.php
@@ -7,6 +7,7 @@
         <div class="table-list-row color-<?= $task['color_id'] ?>">
             <?= $this->render('task_list/task_title', array(
                 'task' => $task,
+                'is_subtask' => FALSE
             )) ?>
 
             <?= $this->render('task_list/task_details', array(
@@ -30,4 +31,4 @@
     <?php endforeach ?>
 </div>
 
-<?= $paginator ?>
\ No newline at end of file
+<?= $paginator ?>
diff --git a/app/Template/task_list/listing.php b/app/Template/task_list/listing.php
index 595a190b..8394ea2e 100644
--- a/app/Template/task_list/listing.php
+++ b/app/Template/task_list/listing.php
@@ -16,6 +16,7 @@
                     'task' => $task,
                     'show_items_selection' => true,
                     'redirect' => 'list',
+                    'is_subtask' => FALSE
                 )) ?>
 
                 <?= $this->render('task_list/task_details', array(
diff --git a/app/Template/task_list/task_title.php b/app/Template/task_list/task_title.php
index 662ce1e5..3fc39038 100644
--- a/app/Template/task_list/task_title.php
+++ b/app/Template/task_list/task_title.php
@@ -9,6 +9,6 @@
     <?php endif ?>
 
     <span class="table-list-title <?= $task['is_active'] == 0 ? 'status-closed' : '' ?>">
-        <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])) ?>
+        <?= $this->url->link(($is_subtask ? $task['project_name'] . ': ' : '')  . $this->text->e($task['title']), 'TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])) ?>
     </span>
 </div>
-- 
cgit v1.2.3