summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog2
-rw-r--r--app/Controller/GroupListController.php7
-rw-r--r--app/Model/GroupModel.php8
-rw-r--r--app/Template/group/dropdown.php9
-rw-r--r--app/Template/group/index.php100
-rw-r--r--app/Template/group/users.php49
-rw-r--r--tests/units/Model/GroupModelTest.php1
7 files changed, 98 insertions, 78 deletions
diff --git a/ChangeLog b/ChangeLog
index d8b4f297..656fa32a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,7 +11,7 @@ Improvements:
* Add toggle button to show/hide subtasks in task list view
* Display tags in task list view
* Make user actions available from contextual menu
-* Change users list layout
+* Change users and groups list layout
* Project priority is always rendered now
Breaking Changes:
diff --git a/app/Controller/GroupListController.php b/app/Controller/GroupListController.php
index 4486bbff..11081e4a 100644
--- a/app/Controller/GroupListController.php
+++ b/app/Controller/GroupListController.php
@@ -2,6 +2,9 @@
namespace Kanboard\Controller;
+use Kanboard\Model\GroupModel;
+use Kanboard\Model\UserModel;
+
/**
* Group Controller
*
@@ -20,7 +23,7 @@ class GroupListController extends BaseController
$paginator = $this->paginator
->setUrl('GroupListController', 'index')
->setMax(30)
- ->setOrder('name')
+ ->setOrder(GroupModel::TABLE.'.name')
->setQuery($this->groupModel->getQuery())
->calculate();
@@ -43,7 +46,7 @@ class GroupListController extends BaseController
$paginator = $this->paginator
->setUrl('GroupListController', 'users', array('group_id' => $group_id))
->setMax(30)
- ->setOrder('username')
+ ->setOrder(UserModel::TABLE.'.username')
->setQuery($this->groupMemberModel->getQuery($group_id))
->calculate();
diff --git a/app/Model/GroupModel.php b/app/Model/GroupModel.php
index b43423b3..5acf7e3f 100644
--- a/app/Model/GroupModel.php
+++ b/app/Model/GroupModel.php
@@ -27,7 +27,9 @@ class GroupModel extends Base
*/
public function getQuery()
{
- return $this->db->table(self::TABLE);
+ return $this->db->table(self::TABLE)
+ ->columns('id', 'name', 'external_id')
+ ->subquery('SELECT COUNT(*) FROM '.GroupMemberModel::TABLE.' WHERE group_id='.self::TABLE.'.id', 'nb_users');
}
/**
@@ -39,7 +41,7 @@ class GroupModel extends Base
*/
public function getById($group_id)
{
- return $this->getQuery()->eq('id', $group_id)->findOne();
+ return $this->db->table(self::TABLE)->eq('id', $group_id)->findOne();
}
/**
@@ -51,7 +53,7 @@ class GroupModel extends Base
*/
public function getByExternalId($external_id)
{
- return $this->getQuery()->eq('external_id', $external_id)->findOne();
+ return $this->db->table(self::TABLE)->eq('external_id', $external_id)->findOne();
}
/**
diff --git a/app/Template/group/dropdown.php b/app/Template/group/dropdown.php
new file mode 100644
index 00000000..9d807dc5
--- /dev/null
+++ b/app/Template/group/dropdown.php
@@ -0,0 +1,9 @@
+<div class="dropdown">
+ <a href="#" class="dropdown-menu dropdown-menu-link-icon"><strong>#<?= $group['id'] ?> <i class="fa fa-caret-down"></i></strong></a>
+ <ul>
+ <li><?= $this->modal->medium('plus', t('Add group member'), 'GroupListController', 'associate', array('group_id' => $group['id'])) ?></li>
+ <li><?= $this->url->icon('users', t('Members'), 'GroupListController', 'users', array('group_id' => $group['id'])) ?></li>
+ <li><?= $this->modal->medium('edit', t('Edit'), 'GroupModificationController', 'show', array('group_id' => $group['id'])) ?></li>
+ <li><?= $this->modal->confirm('trash-o', t('Remove'), 'GroupListController', 'confirm', array('group_id' => $group['id'])) ?></li>
+ </ul>
+</div>
diff --git a/app/Template/group/index.php b/app/Template/group/index.php
index 8370dc53..f85eab8b 100644
--- a/app/Template/group/index.php
+++ b/app/Template/group/index.php
@@ -1,42 +1,62 @@
-<section id="main">
- <div class="page-header">
- <ul>
- <li><?= $this->url->icon('user', t('All users'), 'UserListController', 'show') ?></li>
- <li><?= $this->modal->medium('user-plus', t('New group'), 'GroupCreationController', 'show') ?></li>
- </ul>
+<div class="page-header">
+ <ul>
+ <li><?= $this->url->icon('user', t('All users'), 'UserListController', 'show') ?></li>
+ <li><?= $this->modal->medium('user-plus', t('New group'), 'GroupCreationController', 'show') ?></li>
+ </ul>
+</div>
+<?php if ($paginator->isEmpty()): ?>
+ <p class="alert"><?= t('There is no group.') ?></p>
+<?php else: ?>
+ <div class="table-list">
+ <div class="table-list-header">
+ <div class="table-list-header-count">
+ <?php if ($paginator->getTotal() > 1): ?>
+ <?= t('%d groups', $paginator->getTotal()) ?>
+ <?php else: ?>
+ <?= t('%d group', $paginator->getTotal()) ?>
+ <?php endif ?>
+ </div>
+ <div class="table-list-header-menu">
+ <div class="dropdown">
+ <a href="#" class="dropdown-menu dropdown-menu-link-icon"><strong><?= t('Sort') ?> <i class="fa fa-caret-down"></i></strong></a>
+ <ul>
+ <li>
+ <?= $paginator->order(t('Group ID'), \Kanboard\Model\GroupModel::TABLE.'.id') ?>
+ </li>
+ <li>
+ <?= $paginator->order(t('Name'), \Kanboard\Model\GroupModel::TABLE.'.name') ?>
+ </li>
+ <li>
+ <?= $paginator->order(t('External ID'), \Kanboard\Model\GroupModel::TABLE.'.external_id') ?>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+
+ <?php foreach ($paginator->getCollection() as $group): ?>
+ <div class="table-list-row table-border-left">
+ <span class="table-list-title">
+ <?= $this->render('group/dropdown', array('group' => $group)) ?>
+ <?= $this->url->link($this->text->e($group['name']), 'GroupListController', 'users', array('group_id' => $group['id'])) ?>
+ </span>
+
+ <div class="table-list-details">
+ <ul>
+ <?php if ($group['nb_users'] > 1): ?>
+ <li><?= t('%d users', $group['nb_users']) ?></li>
+ <?php else: ?>
+ <li><?= t('%d user', $group['nb_users']) ?></li>
+ <?php endif ?>
+
+ <?php if (! empty($group['external_id'])): ?>
+ <li><?= $this->text->e($group['external_id']) ?></li>
+ <?php endif ?>
+ </ul>
+ </div>
+ </div>
+ <?php endforeach ?>
</div>
- <?php if ($paginator->isEmpty()): ?>
- <p class="alert"><?= t('There is no group.') ?></p>
- <?php else: ?>
- <table class="table-fixed table-scrolling table-hover">
- <tr>
- <th class="column-5"><?= $paginator->order(t('Id'), 'id') ?></th>
- <th><?= $paginator->order(t('Name'), 'name') ?></th>
- <th class="column-30"><?= $paginator->order(t('External Id'), 'external_id') ?></th>
- </tr>
- <?php foreach ($paginator->getCollection() as $group): ?>
- <tr>
- <td>
- <div class="dropdown">
- <a href="#" class="dropdown-menu dropdown-menu-link-icon"><strong>#<?= $group['id'] ?> <i class="fa fa-caret-down"></i></strong></a>
- <ul>
- <li><?= $this->modal->medium('plus', t('Add group member'), 'GroupListController', 'associate', array('group_id' => $group['id'])) ?></li>
- <li><?= $this->url->icon('users', t('Members'), 'GroupListController', 'users', array('group_id' => $group['id'])) ?></li>
- <li><?= $this->modal->medium('edit', t('Edit'), 'GroupModificationController', 'show', array('group_id' => $group['id'])) ?></li>
- <li><?= $this->modal->confirm('trash-o', t('Remove'), 'GroupListController', 'confirm', array('group_id' => $group['id'])) ?></li>
- </ul>
- </div>
- </td>
- <td>
- <?= $this->url->link($this->text->e($group['name']), 'GroupListController', 'users', array('group_id' => $group['id'])) ?>
- </td>
- <td>
- <?= $this->text->e($group['external_id']) ?>
- </td>
- </tr>
- <?php endforeach ?>
- </table>
- <?= $paginator ?>
- <?php endif ?>
-</section>
+ <?= $paginator ?>
+<?php endif ?>
diff --git a/app/Template/group/users.php b/app/Template/group/users.php
index 63cec338..5025ca7a 100644
--- a/app/Template/group/users.php
+++ b/app/Template/group/users.php
@@ -1,6 +1,7 @@
<section id="main">
<div class="page-header">
<ul>
+ <li><?= $this->url->icon('user', t('All users'), 'UserListController', 'show') ?></li>
<li><?= $this->url->icon('users', t('View all groups'), 'GroupListController', 'index') ?></li>
<li><?= $this->modal->medium('plus', t('Add group member'), 'GroupListController', 'associate', array('group_id' => $group['id'])) ?></li>
</ul>
@@ -8,40 +9,24 @@
<?php if ($paginator->isEmpty()): ?>
<p class="alert"><?= t('There is no user in this group.') ?></p>
<?php else: ?>
- <table class="table-striped table-scrolling table-hover">
- <tr>
- <th class="column-5"><?= $paginator->order(t('Id'), 'id') ?></th>
- <th><?= $paginator->order(t('Username'), 'username') ?></th>
- <th><?= $paginator->order(t('Name'), 'name') ?></th>
- <th><?= $paginator->order(t('Email'), 'email') ?></th>
- </tr>
+ <div class="table-list">
+ <?= $this->render('user_list/header', array('paginator' => $paginator)) ?>
<?php foreach ($paginator->getCollection() as $user): ?>
- <tr>
- <td>
- <div class="dropdown">
- <a href="#" class="dropdown-menu dropdown-menu-link-icon"><strong><?= '#'.$user['id'] ?> <i class="fa fa-caret-down"></i></strong></a>
- <ul>
- <li>
- <?= $this->url->icon('user', t('View profile'), 'UserViewController', 'show', array('user_id' => $user['id'])) ?>
- </li>
- <li>
- <?= $this->modal->confirm('trash-o', t('Remove this user from group'), 'GroupListController', 'dissociate', array('group_id' => $group['id'], 'user_id' => $user['id'])) ?>
- </li>
- </ul>
- </div>
- </td>
- <td>
- <?= $this->url->link($this->text->e($user['username']), 'UserViewController', 'show', array('user_id' => $user['id'])) ?>
- </td>
- <td>
- <?= $this->text->e($user['name']) ?>
- </td>
- <td>
- <a href="mailto:<?= $this->text->e($user['email']) ?>"><?= $this->text->e($user['email']) ?></a>
- </td>
- </tr>
+ <div class="table-list-row table-border-left">
+ <?= $this->render('user_list/user_title', array(
+ 'user' => $user,
+ )) ?>
+
+ <?= $this->render('user_list/user_details', array(
+ 'user' => $user,
+ )) ?>
+
+ <?= $this->render('user_list/user_icons', array(
+ 'user' => $user,
+ )) ?>
+ </div>
<?php endforeach ?>
- </table>
+ </div>
<?= $paginator ?>
<?php endif ?>
diff --git a/tests/units/Model/GroupModelTest.php b/tests/units/Model/GroupModelTest.php
index 4ad0a167..7329a23b 100644
--- a/tests/units/Model/GroupModelTest.php
+++ b/tests/units/Model/GroupModelTest.php
@@ -37,6 +37,7 @@ class GroupModelTest extends Base
$this->assertEquals('uuid', $groups[0]['external_id']);
$this->assertEquals('B', $groups[1]['name']);
$this->assertEquals('', $groups[1]['external_id']);
+ $this->assertEquals(0, $groups[1]['nb_users']);
}
public function testUpdate()
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-22 21:41:54 +0000