The fullname is displayed instead of the username if not empty

7 files changed, 10 insertions, 10 deletions

diff --git a/app/Templates/board_task.php b/app/Templates/board_task.php
index 61f7f5bf..0bc96579 100644
--- a/app/Templates/board_task.php
+++ b/app/Templates/board_task.php
@@ -4,7 +4,7 @@
 
     <span class="task-board-user">
     <?php if (! empty($task['owner_id'])): ?>
-        <?= t('Assigned to %s', $task['username']) ?>
+        <?= t('Assigned to %s', $task['assignee_name'] ?: $task['assignee_username']) ?>
     <?php else: ?>
         <span class="task-board-nobody"><?= t('Nobody assigned') ?></span>
     <?php endif ?>
@@ -24,7 +24,7 @@
 
     <span class="task-board-user">
     <?php if (! empty($task['owner_id'])): ?>
-        <a class="assignee-popover" href="?controller=board&amp;action=assign&amp;task_id=<?= $task['id'] ?>" title="<?= t('Change assignee') ?>"><?= t('Assigned to %s', $task['username']) ?></a>
+        <a class="assignee-popover" href="?controller=board&amp;action=assign&amp;task_id=<?= $task['id'] ?>" title="<?= t('Change assignee') ?>"><?= t('Assigned to %s', $task['assignee_name'] ?: $task['assignee_username']) ?></a>
     <?php else: ?>
         <a class="assignee-popover" href="?controller=board&amp;action=assign&amp;task_id=<?= $task['id'] ?>" title="<?= t('Change assignee') ?>" class="task-board-nobody"><?= t('Nobody assigned') ?></a>
     <?php endif ?>
diff --git a/app/Templates/comment_show.php b/app/Templates/comment_show.php
index d9d40d7e..08d77b29 100644
--- a/app/Templates/comment_show.php
+++ b/app/Templates/comment_show.php
@@ -1,7 +1,7 @@
 <div class="comment <?= isset($preview) ? 'comment-preview' : '' ?>" id="comment-<?= $comment['id'] ?>">
 
     <p class="comment-title">
-        <span class="comment-username"><?= Helper\escape($comment['username']) ?></span> @ <span class="comment-date"><?= dt('%B %e, %Y at %k:%M %p', $comment['date']) ?></span>
+        <span class="comment-username"><?= Helper\escape($comment['name'] ?: $comment['username']) ?></span> @ <span class="comment-date"><?= dt('%B %e, %Y at %k:%M %p', $comment['date']) ?></span>
     </p>
 
     <div class="comment-inner">
diff --git a/app/Templates/notification_comment_creation.php b/app/Templates/notification_comment_creation.php
index ff286790..79d34f90 100644
--- a/app/Templates/notification_comment_creation.php
+++ b/app/Templates/notification_comment_creation.php
@@ -1,6 +1,6 @@
 <h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2>
 
-<h3><?= t('New comment posted by %s', $comment['username']) ?></h3>
+<h3><?= t('New comment posted by %s', $comment['name'] ?: $comment['username']) ?></h3>
 
 <?= Helper\parse($comment['comment']) ?>
 
diff --git a/app/Templates/subtask_show.php b/app/Templates/subtask_show.php
index b9385c7e..968473af 100644
--- a/app/Templates/subtask_show.php
+++ b/app/Templates/subtask_show.php
@@ -24,7 +24,7 @@ $total_remaining = 0;
         <td><?= Helper\escape($subtask['status_name']) ?></td>
         <td>
             <?php if (! empty($subtask['username'])): ?>
-                <?= Helper\escape($subtask['username']) ?>
+                <?= Helper\escape($subtask['name'] ?: $subtask['username']) ?>
             <?php endif ?>
         </td>
         <td>
diff --git a/app/Templates/task_show.php b/app/Templates/task_show.php
index a353d4d0..329fde80 100644
--- a/app/Templates/task_show.php
+++ b/app/Templates/task_show.php
@@ -24,13 +24,13 @@
         <?php endif ?>
         <?php if ($task['creator_username']): ?>
         <li>
-            <?= t('Created by %s', $task['creator_username']) ?>
+            <?= t('Created by %s', $task['creator_name'] ?: $task['creator_username']) ?>
         </li>
         <?php endif ?>
         <li>
             <strong>
             <?php if ($task['assignee_username']): ?>
-                <?= t('Assigned to %s', $task['assignee_username']) ?>
+                <?= t('Assigned to %s', $task['assignee_name'] ?: $task['assignee_username']) ?>
             <?php else: ?>
                 <?= t('There is nobody assigned') ?>
             <?php endif ?>
diff --git a/app/Templates/task_table.php b/app/Templates/task_table.php
index ad513452..d10d3f42 100644
--- a/app/Templates/task_table.php
+++ b/app/Templates/task_table.php
@@ -25,8 +25,8 @@
             <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>" title="<?= t('View this task') ?>"><?= Helper\escape($task['title']) ?></a>
         </td>
         <td>
-            <?php if ($task['username']): ?>
-                <?= Helper\escape($task['username']) ?>
+            <?php if ($task['assignee_username']): ?>
+                <?= Helper\escape($task['assignee_name'] ?: $task['assignee_username']) ?>
             <?php else: ?>
                 <?= t('Unassigned') ?>
             <?php endif ?>
diff --git a/app/Templates/user_remove.php b/app/Templates/user_remove.php
index 61d4163b..45774d27 100644
--- a/app/Templates/user_remove.php
+++ b/app/Templates/user_remove.php
@@ -4,7 +4,7 @@
     </div>
 
     <div class="confirm">
-        <p class="alert alert-info"><?= t('Do you really want to remove this user: "%s"?', $user['username']) ?></p>
+        <p class="alert alert-info"><?= t('Do you really want to remove this user: "%s"?', $user['name'] ?: $user['username']) ?></p>
 
         <div class="form-actions">
             <a href="?controller=user&amp;action=remove&amp;user_id=<?= $user['id'].Helper\param_csrf() ?>" class="btn btn-red"><?= t('Yes') ?></a>