summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/Template/board/tooltip_subtasks.php4
-rw-r--r--app/Template/task/sidebar.php2
-rw-r--r--app/Template/task_creation/form.php2
-rw-r--r--app/Template/user/sidebar.php2
4 files changed, 7 insertions, 3 deletions
diff --git a/app/Template/board/tooltip_subtasks.php b/app/Template/board/tooltip_subtasks.php
index 65b7ce4d..dc076d26 100644
--- a/app/Template/board/tooltip_subtasks.php
+++ b/app/Template/board/tooltip_subtasks.php
@@ -5,7 +5,9 @@
<?= $this->subtask->toggleStatus($subtask, $task['project_id']) ?>
</td>
<td>
- <?= $this->e($subtask['username'] ?: $this->user->getFullname($subtask)) ?>
+ <?php if (! empty($subtask['username'])): ?>
+ <?= $this->e($subtask['name'] ?: $subtask['username']) ?>
+ <?php endif ?>
</td>
</tr>
<?php endforeach ?>
diff --git a/app/Template/task/sidebar.php b/app/Template/task/sidebar.php
index d1fab13e..951c5095 100644
--- a/app/Template/task/sidebar.php
+++ b/app/Template/task/sidebar.php
@@ -28,6 +28,6 @@
<?= $this->url->link(t('External links'), 'TaskExternalLink', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
</li>
- <?= $this->hook->render('template:task:sidebar') ?>
+ <?= $this->hook->render('template:task:sidebar', array('task' => $task)) ?>
</ul>
</div>
diff --git a/app/Template/task_creation/form.php b/app/Template/task_creation/form.php
index 5a976ac9..84f74c36 100644
--- a/app/Template/task_creation/form.php
+++ b/app/Template/task_creation/form.php
@@ -55,6 +55,8 @@
<?= $this->task->selectScore($values, $errors) ?>
<?= $this->task->selectTimeEstimated($values, $errors) ?>
<?= $this->task->selectDueDate($values, $errors) ?>
+
+ <?= $this->hook->render('template:task:form:right-column', array('values'=>$values, 'errors'=>$errors)) ?>
</div>
<div class="form-actions">
diff --git a/app/Template/user/sidebar.php b/app/Template/user/sidebar.php
index 2faf8220..20fd2ad2 100644
--- a/app/Template/user/sidebar.php
+++ b/app/Template/user/sidebar.php
@@ -26,7 +26,7 @@
</li>
<?php endif ?>
- <?= $this->hook->render('template:user:sidebar:information') ?>
+ <?= $this->hook->render('template:user:sidebar:information', array('user' => $user)) ?>
</ul>
<h2><?= t('Actions') ?></h2>