AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The fullname is displayed instead of the username if not empty

Browse Source
This commit is contained in:
Frédéric Guillot
2014-08-16 17:53:07 -07:00
parent db3c006be8
commit 658123a232
14 changed files with 48 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Model/Comment.php
View File

@@ -45,7 +45,8 @@ class Comment extends Base
self::TABLE.'.task_id', self::TABLE.'.task_id',
self::TABLE.'.user_id', self::TABLE.'.user_id',
self::TABLE.'.comment', self::TABLE.'.comment',
User::TABLE.'.username' User::TABLE.'.username',
User::TABLE.'.name'
) )
->join(User::TABLE, 'id', 'user_id') ->join(User::TABLE, 'id', 'user_id')
->orderBy(self::TABLE.'.date', 'ASC') ->orderBy(self::TABLE.'.date', 'ASC')
@@ -70,7 +71,8 @@ class Comment extends Base
self::TABLE.'.user_id', self::TABLE.'.user_id',
self::TABLE.'.date', self::TABLE.'.date',
self::TABLE.'.comment', self::TABLE.'.comment',
User::TABLE.'.username' User::TABLE.'.username',
User::TABLE.'.name'
) )
->join(User::TABLE, 'id', 'user_id') ->join(User::TABLE, 'id', 'user_id')
->eq(self::TABLE.'.id', $comment_id) ->eq(self::TABLE.'.id', $comment_id)

15
app/Model/Project.php
View File

@@ -80,12 +80,23 @@ class Project extends Base
*/ */
public function getAllowedUsers($project_id) public function getAllowedUsers($project_id)
{ {
return $this->db $users = $this->db
->table(self::TABLE_USERS) ->table(self::TABLE_USERS)
->join(User::TABLE, 'id', 'user_id') ->join(User::TABLE, 'id', 'user_id')
->eq('project_id', $project_id) ->eq('project_id', $project_id)
->asc('username') ->asc('username')
->listing('user_id', 'username'); ->columns(User::TABLE.'.id', User::TABLE.'.username', User::TABLE.'.name')
->findAll();
$result = array();
foreach ($users as $user) {
$result[$user['id']] = $user['name'] ?: $user['username'];
}
asort($result);
return $result;
} }
/** /**

2
app/Model/SubTask.php
View File

@@ -80,7 +80,7 @@ class SubTask extends Base
$status = $this->getStatusList(); $status = $this->getStatusList();
$subtasks = $this->db->table(self::TABLE) $subtasks = $this->db->table(self::TABLE)
->eq('task_id', $task_id) ->eq('task_id', $task_id)
->columns(self::TABLE.'.*', User::TABLE.'.username') ->columns(self::TABLE.'.*', User::TABLE.'.username', User::TABLE.'.name')
->join(User::TABLE, 'id', 'user_id') ->join(User::TABLE, 'id', 'user_id')
->findAll(); ->findAll();

7
app/Model/Task.php
View File

@@ -125,7 +125,9 @@ class Task extends Base
projects.name AS project_name, projects.name AS project_name,
columns.title AS column_title, columns.title AS column_title,
users.username AS assignee_username, users.username AS assignee_username,
creators.username AS creator_username users.name AS assignee_name,
creators.username AS creator_username,
creators.name AS creator_name
FROM tasks FROM tasks
LEFT JOIN users ON users.id = tasks.owner_id LEFT JOIN users ON users.id = tasks.owner_id
LEFT JOIN users AS creators ON creators.id = tasks.creator_id LEFT JOIN users AS creators ON creators.id = tasks.creator_id
@@ -209,7 +211,8 @@ class Task extends Base
'tasks.is_active', 'tasks.is_active',
'tasks.score', 'tasks.score',
'tasks.category_id', 'tasks.category_id',
'users.username' 'users.username AS assignee_username',
'users.name AS assignee_name'
) )
->join(User::TABLE, 'id', 'owner_id'); ->join(User::TABLE, 'id', 'owner_id');

12
app/Model/User.php
View File

@@ -98,7 +98,17 @@ class User extends Base
*/ */
public function getList() public function getList()
{ {
return $this->db->table(self::TABLE)->asc('username')->listing('id', 'username'); $users = $this->db->table(self::TABLE)->columns('id', 'username', 'name')->findAll();
$result = array();
foreach ($users as $user) {
$result[$user['id']] = $user['name'] ?: $user['username'];
}
asort($result);
return $result;
} }
/** /**

4
app/Templates/board_task.php
View File

@@ -4,7 +4,7 @@
<span class="task-board-user"> <span class="task-board-user">
<?php if (! empty($task['owner_id'])): ?> <?php if (! empty($task['owner_id'])): ?>
<?= t('Assigned to %s', $task['username']) ?> <?= t('Assigned to %s', $task['assignee_name'] ?: $task['assignee_username']) ?>
<?php else: ?> <?php else: ?>
<span class="task-board-nobody"><?= t('Nobody assigned') ?></span> <span class="task-board-nobody"><?= t('Nobody assigned') ?></span>
<?php endif ?> <?php endif ?>
@@ -24,7 +24,7 @@
<span class="task-board-user"> <span class="task-board-user">
<?php if (! empty($task['owner_id'])): ?> <?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: ?> <?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> <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 ?> <?php endif ?>

2
app/Templates/comment_show.php
View File

@@ -1,7 +1,7 @@
<div class="comment <?= isset($preview) ? 'comment-preview' : '' ?>" id="comment-<?= $comment['id'] ?>"> <div class="comment <?= isset($preview) ? 'comment-preview' : '' ?>" id="comment-<?= $comment['id'] ?>">
<p class="comment-title"> <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> </p>
<div class="comment-inner"> <div class="comment-inner">

2
app/Templates/notification_comment_creation.php
View File

@@ -1,6 +1,6 @@
<h2><?= Helper\escape($task['title']) ?> (#<?= $task['id'] ?>)</h2> <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']) ?> <?= Helper\parse($comment['comment']) ?>

2
app/Templates/subtask_show.php
View File

@@ -24,7 +24,7 @@ $total_remaining = 0;
<td><?= Helper\escape($subtask['status_name']) ?></td> <td><?= Helper\escape($subtask['status_name']) ?></td>
<td> <td>
<?php if (! empty($subtask['username'])): ?> <?php if (! empty($subtask['username'])): ?>
<?= Helper\escape($subtask['username']) ?> <?= Helper\escape($subtask['name'] ?: $subtask['username']) ?>
<?php endif ?> <?php endif ?>
</td> </td>
<td> <td>

4
app/Templates/task_show.php
View File

@@ -24,13 +24,13 @@
<?php endif ?> <?php endif ?>
<?php if ($task['creator_username']): ?> <?php if ($task['creator_username']): ?>
<li> <li>
<?= t('Created by %s', $task['creator_username']) ?> <?= t('Created by %s', $task['creator_name'] ?: $task['creator_username']) ?>
</li> </li>
<?php endif ?> <?php endif ?>
<li> <li>
<strong> <strong>
<?php if ($task['assignee_username']): ?> <?php if ($task['assignee_username']): ?>
<?= t('Assigned to %s', $task['assignee_username']) ?> <?= t('Assigned to %s', $task['assignee_name'] ?: $task['assignee_username']) ?>
<?php else: ?> <?php else: ?>
<?= t('There is nobody assigned') ?> <?= t('There is nobody assigned') ?>
<?php endif ?> <?php endif ?>

4
app/Templates/task_table.php
View File

@@ -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> <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>" title="<?= t('View this task') ?>"><?= Helper\escape($task['title']) ?></a>
</td> </td>
<td> <td>
<?php if ($task['username']): ?> <?php if ($task['assignee_username']): ?>
<?= Helper\escape($task['username']) ?> <?= Helper\escape($task['assignee_name'] ?: $task['assignee_username']) ?>
<?php else: ?> <?php else: ?>
<?= t('Unassigned') ?> <?= t('Unassigned') ?>
<?php endif ?> <?php endif ?>

2
app/Templates/user_remove.php
View File

@@ -4,7 +4,7 @@
</div> </div>
<div class="confirm"> <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"> <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> <a href="?controller=user&amp;action=remove&amp;user_id=<?= $user['id'].Helper\param_csrf() ?>" class="btn btn-red"><?= t('Yes') ?></a>

2
app/helpers.php
View File

@@ -37,7 +37,7 @@ function is_admin()
function get_username() function get_username()
{ {
return $_SESSION['user']['username']; return $_SESSION['user']['name'] ?: $_SESSION['user']['username'];
} }
function parse($text) function parse($text)

6
tests/functionals/ApiTest.php
View File

@@ -247,7 +247,7 @@ class Api extends PHPUnit_Framework_TestCase
{ {
$users = $this->client->getAllowedUsers(1); $users = $this->client->getAllowedUsers(1);
$this->assertNotFalse($users); $this->assertNotFalse($users);
$this->assertEquals(array(1 => 'admin', 2 => 'titi'), $users); $this->assertEquals(array(1 => 'admin', 2 => 'Titi'), $users);
} }
public function testAllowedUser() public function testAllowedUser()
@@ -256,7 +256,7 @@ class Api extends PHPUnit_Framework_TestCase
$users = $this->client->getAllowedUsers(1); $users = $this->client->getAllowedUsers(1);
$this->assertNotFalse($users); $this->assertNotFalse($users);
$this->assertEquals(array(2 => 'titi'), $users); $this->assertEquals(array(2 => 'Titi'), $users);
} }
public function testRevokeUser() public function testRevokeUser()
@@ -265,7 +265,7 @@ class Api extends PHPUnit_Framework_TestCase
$users = $this->client->getAllowedUsers(1); $users = $this->client->getAllowedUsers(1);
$this->assertNotFalse($users); $this->assertNotFalse($users);
$this->assertEquals(array(1 => 'admin', 2 => 'titi'), $users); $this->assertEquals(array(1 => 'admin', 2 => 'Titi'), $users);
} }
public function testCreateComment() public function testCreateComment()