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

Add groups (teams)

Browse Source
This commit is contained in:
Frederic Guillot
2015-11-25 22:06:39 -05:00
parent a8da794b60
commit e582d4047b
21 changed files with 994 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

255
app/Controller/Group.php Normal file
View File

@@ -0,0 +1,255 @@
<?php
namespace Kanboard\Controller;
/**
* Group Controller
*
* @package controller
* @author Frederic Guillot
*/
class Group extends Base
{
/**
* List all groups
*
* @access public
*/
public function index()
{
$paginator = $this->paginator
->setUrl('group', 'index')
->setMax(30)
->setOrder('name')
->setQuery($this->group->getQuery())
->calculate();
$this->response->html($this->template->layout('group/index', array(
'board_selector' => $this->projectPermission->getAllowedProjects($this->userSession->getId()),
'title' => t('Groups').' ('.$paginator->getTotal().')',
'paginator' => $paginator,
)));
}
/**
* List all users
*
* @access public
*/
public function users()
{
$group_id = $this->request->getIntegerParam('group_id');
$group = $this->group->getById($group_id);
$paginator = $this->paginator
->setUrl('group', 'users')
->setMax(30)
->setOrder('username')
->setQuery($this->groupMember->getQuery($group_id))
->calculate();
$this->response->html($this->template->layout('group/users', array(
'board_selector' => $this->projectPermission->getAllowedProjects($this->userSession->getId()),
'title' => t('Members of %s', $group['name']).' ('.$paginator->getTotal().')',
'paginator' => $paginator,
'group' => $group,
)));
}
/**
* Display a form to create a new group
*
* @access public
*/
public function create(array $values = array(), array $errors = array())
{
$this->response->html($this->template->layout('group/create', array(
'board_selector' => $this->projectPermission->getAllowedProjects($this->userSession->getId()),
'errors' => $errors,
'values' => $values,
'title' => t('New group')
)));
}
/**
* Validate and save a new group
*
* @access public
*/
public function save()
{
$values = $this->request->getValues();
list($valid, $errors) = $this->group->validateCreation($values);
if ($valid) {
if ($this->group->create($values['name']) !== false) {
$this->flash->success(t('Group created successfully.'));
$this->response->redirect($this->helper->url->to('group', 'index'));
} else {
$this->flash->failure(t('Unable to create your group.'));
}
}
$this->create($values, $errors);
}
/**
* Display a form to update a group
*
* @access public
*/
public function edit(array $values = array(), array $errors = array())
{
if (empty($values)) {
$values = $this->group->getById($this->request->getIntegerParam('group_id'));
}
$this->response->html($this->template->layout('group/edit', array(
'board_selector' => $this->projectPermission->getAllowedProjects($this->userSession->getId()),
'errors' => $errors,
'values' => $values,
'title' => t('Edit group')
)));
}
/**
* Validate and save a group
*
* @access public
*/
public function update()
{
$values = $this->request->getValues();
list($valid, $errors) = $this->group->validateModification($values);
if ($valid) {
if ($this->group->update($values) !== false) {
$this->flash->success(t('Group updated successfully.'));
$this->response->redirect($this->helper->url->to('group', 'index'));
} else {
$this->flash->failure(t('Unable to update your group.'));
}
}
$this->edit($values, $errors);
}
/**
* Form to associate a user to a group
*
* @access public
*/
public function associate(array $values = array(), array $errors = array())
{
$group_id = $this->request->getIntegerParam('group_id');
$group = $this->group->getbyId($group_id);
if (empty($values)) {
$values['group_id'] = $group_id;
}
$this->response->html($this->template->layout('group/associate', array(
'board_selector' => $this->projectPermission->getAllowedProjects($this->userSession->getId()),
'users' => $this->user->prepareList($this->groupMember->getNotMembers($group_id)),
'group' => $group,
'errors' => $errors,
'values' => $values,
'title' => t('Add group member to "%s"', $group['name']),
)));
}
/**
* Add user to a group
*
* @access public
*/
public function addUser()
{
$values = $this->request->getValues();
if (isset($values['group_id']) && isset($values['user_id'])) {
if ($this->groupMember->addUser($values['group_id'], $values['user_id'])) {
$this->flash->success(t('Group member added successfully.'));
$this->response->redirect($this->helper->url->to('group', 'users', array('group_id' => $values['group_id'])));
} else {
$this->flash->failure(t('Unable to add group member.'));
}
}
$this->associate($values);
}
/**
* Confirmation dialog to remove a user from a group
*
* @access public
*/
public function dissociate()
{
$group_id = $this->request->getIntegerParam('group_id');
$user_id = $this->request->getIntegerParam('user_id');
$group = $this->group->getById($group_id);
$user = $this->user->getById($user_id);
$this->response->html($this->template->layout('group/dissociate', array(
'group' => $group,
'user' => $user,
'title' => t('Remove a user from group "%s', $group['name']),
)));
}
/**
* Remove a user from a group
*
* @access public
*/
public function removeUser()
{
$this->checkCSRFParam();
$group_id = $this->request->getIntegerParam('group_id');
$user_id = $this->request->getIntegerParam('user_id');
if ($this->groupMember->removeUser($group_id, $user_id)) {
$this->flash->success(t('User removed successfully from this group.'));
} else {
$this->flash->failure(t('Unable to remove this user from the group.'));
}
$this->response->redirect($this->helper->url->to('group', 'users', array('group_id' => $group_id)));
}
/**
* Confirmation dialog to remove a group
*
* @access public
*/
public function confirm()
{
$group_id = $this->request->getIntegerParam('group_id');
$group = $this->group->getById($group_id);
$this->response->html($this->template->layout('group/remove', array(
'group' => $group,
'title' => t('Remove group'),
)));
}
/**
* Remove a group
*
* @access public
*/
public function remove()
{
$this->checkCSRFParam();
$group_id = $this->request->getIntegerParam('group_id');
if ($this->group->remove($group_id)) {
$this->flash->success(t('Group removed successfully.'));
} else {
$this->flash->failure(t('Unable to remove this group.'));
}
$this->response->redirect($this->helper->url->to('group', 'index'));
}
}

151
app/Model/Group.php Normal file
View File

@@ -0,0 +1,151 @@
<?php
namespace Kanboard\Model;
use SimpleValidator\Validator;
use SimpleValidator\Validators;
/**
* Group Model
*
* @package model
* @author Frederic Guillot
*/
class Group extends Base
{
/**
* SQL table name
*
* @var string
*/
const TABLE = 'groups';
/**
* Get query to fetch all groups
*
* @access public
* @return \PicoDb\Table
*/
public function getQuery()
{
return $this->db->table(self::TABLE);
}
/**
* Get a specific group by id
*
* @access public
* @param integer $group_id
* @return array
*/
public function getById($group_id)
{
return $this->getQuery()->eq('id', $group_id)->findOne();
}
/**
* Get all groups
*
* @access public
* @return array
*/
public function getAll()
{
return $this->getQuery()->asc('name')->findAll();
}
/**
* Remove a group
*
* @access public
* @param integer $group_id
* @return array
*/
public function remove($group_id)
{
return $this->db->table(self::TABLE)->eq('id', $group_id)->remove();
}
/**
* Create a new group
*
* @access public
* @param string $name
* @param string $external_id
* @return integer|boolean
*/
public function create($name, $external_id = '')
{
return $this->persist(self::TABLE, array(
'name' => $name,
'external_id' => $external_id,
));
}
/**
* Update existing group
*
* @access public
* @param array $values
* @return boolean
*/
public function update(array $values)
{
return $this->db->table(self::TABLE)->eq('id', $values['id'])->update($values);
}
/**
* Validate creation
*
* @access public
* @param array $values Form values
* @return array $valid, $errors [0] = Success or not, [1] = List of errors
*/
public function validateCreation(array $values)
{
$v = new Validator($values, $this->commonValidationRules());
return array(
$v->execute(),
$v->getErrors()
);
}
/**
* Validate modification
*
* @access public
* @param array $values Form values
* @return array $valid, $errors [0] = Success or not, [1] = List of errors
*/
public function validateModification(array $values)
{
$rules = array(
new Validators\Required('id', t('The id is required')),
);
$v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
return array(
$v->execute(),
$v->getErrors()
);
}
/**
* Common validation rules
*
* @access private
* @return array
*/
private function commonValidationRules()
{
return array(
new Validators\Required('name', t('The name is required')),
new Validators\MaxLength('name', t('The maximum length is %d characters', 100), 100),
new Validators\Unique('name', t('The name must be unique'), $this->db->getConnection(), self::TABLE, 'id'),
new Validators\MaxLength('external_id', t('The maximum length is %d characters', 255), 255),
new Validators\Integer('id', t('This value must be an integer')),
);
}
}

95
app/Model/GroupMember.php Normal file
View File

@@ -0,0 +1,95 @@
<?php
namespace Kanboard\Model;
/**
* Group Member Model
*
* @package model
* @author Frederic Guillot
*/
class GroupMember extends Base
{
/**
* SQL table name
*
* @var string
*/
const TABLE = 'group_has_users';
/**
* Get query to fetch all users
*
* @access public
* @param integer $group_id
* @return \PicoDb\Table
*/
public function getQuery($group_id)
{
return $this->db->table(self::TABLE)
->join(User::TABLE, 'id', 'user_id')
->eq('group_id', $group_id);
}
/**
* Get all users
*
* @access public
* @param integer $group_id
* @return array
*/
public function getMembers($group_id)
{
return $this->getQuery($group_id)->findAll();
}
/**
* Get all not members
*
* @access public
* @param integer $group_id
* @return array
*/
public function getNotMembers($group_id)
{
$subquery = $this->db->table(self::TABLE)
->columns('user_id')
->eq('group_id', $group_id);
return $this->db->table(User::TABLE)
->notInSubquery('id', $subquery)
->findAll();
}
/**
* Add user to a group
*
* @access public
* @param integer $group_id
* @param integer $user_id
* @return boolean
*/
public function addUser($group_id, $user_id)
{
return $this->db->table(self::TABLE)->insert(array(
'group_id' => $group_id,
'user_id' => $user_id,
));
}
/**
* Remove user from a group
*
* @access public
* @param integer $group_id
* @param integer $user_id
* @return boolean
*/
public function removeUser($group_id, $user_id)
{
return $this->db->table(self::TABLE)
->eq('group_id', $group_id)
->eq('user_id', $user_id)
->remove();
}
}

24
app/Schema/Mysql.php
View File

@@ -5,7 +5,29 @@ namespace Schema;
use PDO;
use Kanboard\Core\Security\Token;
const VERSION = 94;
const VERSION = 95;
function version_95(PDO $pdo)
{
$pdo->exec("
CREATE TABLE groups (
id INT NOT NULL AUTO_INCREMENT,
external_id VARCHAR(255) DEFAULT '',
name VARCHAR(100) NOT NULL UNIQUE,
PRIMARY KEY(id)
) ENGINE=InnoDB CHARSET=utf8
");
$pdo->exec("
CREATE TABLE group_has_users (
group_id INT NOT NULL,
user_id INT NOT NULL,
FOREIGN KEY(group_id) REFERENCES groups(id) ON DELETE CASCADE,
FOREIGN KEY(user_id) REFERENCES users(id) ON DELETE CASCADE,
UNIQUE(group_id, user_id)
) ENGINE=InnoDB CHARSET=utf8
");
}
function version_94(PDO $pdo)
{

23
app/Schema/Postgres.php
View File

@@ -5,7 +5,28 @@ namespace Schema;
use PDO;
use Kanboard\Core\Security\Token;
const VERSION = 74;
const VERSION = 75;
function version_75(PDO $pdo)
{
$pdo->exec("
CREATE TABLE groups (
id SERIAL PRIMARY KEY,
external_id VARCHAR(255) DEFAULT '',
name VARCHAR(100) NOT NULL UNIQUE
)
");
$pdo->exec("
CREATE TABLE group_has_users (
group_id INTEGER NOT NULL,
user_id INTEGER NOT NULL,
FOREIGN KEY(group_id) REFERENCES groups(id) ON DELETE CASCADE,
FOREIGN KEY(user_id) REFERENCES users(id) ON DELETE CASCADE,
UNIQUE(group_id, user_id)
)
");
}
function version_74(PDO $pdo)
{

37
app/Schema/Sqlite.php
View File

@@ -5,7 +5,42 @@ namespace Schema;
use Kanboard\Core\Security\Token;
use PDO;
const VERSION = 88;
const VERSION = 89;
function version_90(PDO $pdo)
{
$pdo->exec("
CREATE TABLE project_has_groups (
group_id INTEGER NOT NULL,
project_id INTEGER NOT NULL,
role TEXT NOT NULL,
FOREIGN KEY(group_id) REFERENCES groups(id) ON DELETE CASCADE,
FOREIGN KEY(project_id) REFERENCES projects(id) ON DELETE CASCADE,
UNIQUE(group_id, project_id)
)
");
}
function version_89(PDO $pdo)
{
$pdo->exec("
CREATE TABLE groups (
id INTEGER PRIMARY KEY,
external_id TEXT DEFAULT '',
name TEXT NOCASE NOT NULL UNIQUE
)
");
$pdo->exec("
CREATE TABLE group_has_users (
group_id INTEGER NOT NULL,
user_id INTEGER NOT NULL,
FOREIGN KEY(group_id) REFERENCES groups(id) ON DELETE CASCADE,
FOREIGN KEY(user_id) REFERENCES users(id) ON DELETE CASCADE,
UNIQUE(group_id, user_id)
)
");
}
function version_88(PDO $pdo)
{

2
app/ServiceProvider/ClassProvider.php
View File

@@ -32,6 +32,8 @@ class ClassProvider implements ServiceProviderInterface
'Currency',
'CustomFilter',
'File',
'Group',
'GroupMember',
'LastLogin',
'Link',
'Notification',

25
app/Template/group/associate.php Normal file
View File

@@ -0,0 +1,25 @@
<section id="main">
<div class="page-header">
<ul>
<li><i class="fa fa-users fa-fw"></i><?= $this->url->link(t('View all groups'), 'group', 'index') ?></li>
<li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('View group members'), 'group', 'users', array('group_id' => $group['id'])) ?></li>
</ul>
</div>
<?php if (empty($users)): ?>
<p class="alert"><?= t('There is no user available.') ?></p>
<?php else: ?>
<form method="post" action="<?= $this->url->href('group', 'addUser', array('group_id' => $group['id'])) ?>" autocomplete="off">
<?= $this->form->csrf() ?>
<?= $this->form->hidden('group_id', $values) ?>
<?= $this->form->label(t('User'), 'user_id') ?>
<?= $this->form->select('user_id', $users, $values, $errors, array('required'), 'chosen-select') ?><br/>
<div class="form-actions">
<input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
<?= t('or') ?>
<?= $this->url->link(t('cancel'), 'group', 'index') ?>
</div>
</form>
<?php endif ?>
</section>

19
app/Template/group/create.php Normal file
View File

@@ -0,0 +1,19 @@
<section id="main">
<div class="page-header">
<ul>
<li><i class="fa fa-users fa-fw"></i><?= $this->url->link(t('View all groups'), 'group', 'index') ?></li>
</ul>
</div>
<form method="post" action="<?= $this->url->href('group', 'save') ?>" autocomplete="off">
<?= $this->form->csrf() ?>
<?= $this->form->label(t('Name'), 'name') ?>
<?= $this->form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="100"')) ?><br/>
<div class="form-actions">
<input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
<?= t('or') ?>
<?= $this->url->link(t('cancel'), 'group', 'index') ?>
</div>
</form>
</section>

19
app/Template/group/dissociate.php Normal file
View File

@@ -0,0 +1,19 @@
<section id="main">
<div class="page-header">
<?php if ($this->user->isAdmin()): ?>
<ul>
<li><i class="fa fa-users fa-fw"></i><?= $this->url->link(t('View all groups'), 'group', 'index') ?></li>
<li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('View group members'), 'group', 'users', array('group_id' => $group['id'])) ?></li>
</ul>
<?php endif ?>
</div>
<div class="confirm">
<p class="alert alert-info"><?= t('Do you really want to remove the user "%s" from the group "%s"?', $user['name'] ?: $user['username'], $group['name']) ?></p>
<div class="form-actions">
<?= $this->url->link(t('Yes'), 'group', 'removeUser', array('group_id' => $group['id'], 'user_id' => $user['id']), true, 'btn btn-red') ?>
<?= t('or') ?>
<?= $this->url->link(t('cancel'), 'group', 'users', array('group_id' => $group['id'])) ?>
</div>
</div>
</section>

22
app/Template/group/edit.php Normal file
View File

@@ -0,0 +1,22 @@
<section id="main">
<div class="page-header">
<ul>
<li><i class="fa fa-users fa-fw"></i><?= $this->url->link(t('View all groups'), 'group', 'index') ?></li>
</ul>
</div>
<form method="post" action="<?= $this->url->href('group', 'update') ?>" autocomplete="off">
<?= $this->form->csrf() ?>
<?= $this->form->hidden('id', $values) ?>
<?= $this->form->hidden('external_id', $values) ?>
<?= $this->form->label(t('Name'), 'name') ?>
<?= $this->form->text('name', $values, $errors, array('autofocus', 'required', 'maxlength="100"')) ?><br/>
<div class="form-actions">
<input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
<?= t('or') ?>
<?= $this->url->link(t('cancel'), 'group', 'index') ?>
</div>
</form>
</section>

45
app/Template/group/index.php Normal file
View File

@@ -0,0 +1,45 @@
<section id="main">
<div class="page-header">
<?php if ($this->user->isAdmin()): ?>
<ul>
<li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('All users'), 'user', 'index') ?></li>
<li><i class="fa fa-user-plus fa-fw"></i><?= $this->url->link(t('New group'), 'group', 'create') ?></li>
</ul>
<?php endif ?>
</div>
<?php if ($paginator->isEmpty()): ?>
<p class="alert"><?= t('There is no group.') ?></p>
<?php else: ?>
<table class="table-small">
<tr>
<th class="column-5"><?= $paginator->order(t('Id'), 'id') ?></th>
<th class="column-20"><?= $paginator->order(t('External Id'), 'external_id') ?></th>
<th><?= $paginator->order(t('Name'), 'name') ?></th>
<th class="column-20"><?= t('Actions') ?></th>
</tr>
<?php foreach ($paginator->getCollection() as $group): ?>
<tr>
<td>
#<?= $group['id'] ?>
</td>
<td>
<?= $this->e($group['external_id']) ?>
</td>
<td>
<?= $this->e($group['name']) ?>
</td>
<td>
<ul>
<li><?= $this->url->link(t('Add group member'), 'group', 'associate', array('group_id' => $group['id'])) ?></li>
<li><?= $this->url->link(t('Users'), 'group', 'users', array('group_id' => $group['id'])) ?></li>
<li><?= $this->url->link(t('Edit'), 'group', 'edit', array('group_id' => $group['id'])) ?></li>
<li><?= $this->url->link(t('Remove'), 'group', 'confirm', array('group_id' => $group['id'])) ?></li>
</ul>
</td>
</tr>
<?php endforeach ?>
</table>
<?= $paginator ?>
<?php endif ?>
</section>

19
app/Template/group/remove.php Normal file
View File

@@ -0,0 +1,19 @@
<section id="main">
<div class="page-header">
<?php if ($this->user->isAdmin()): ?>
<ul>
<li><i class="fa fa-users fa-fw"></i><?= $this->url->link(t('View all groups'), 'group', 'index') ?></li>
<li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('View group members'), 'group', 'users', array('group_id' => $group['id'])) ?></li>
</ul>
<?php endif ?>
</div>
<div class="confirm">
<p class="alert alert-info"><?= t('Do you really want to remove this group: "%s"?', $group['name']) ?></p>
<div class="form-actions">
<?= $this->url->link(t('Yes'), 'group', 'remove', array('group_id' => $group['id']), true, 'btn btn-red') ?>
<?= t('or') ?>
<?= $this->url->link(t('cancel'), 'group', 'index') ?>
</div>
</div>
</section>

44
app/Template/group/users.php Normal file
View File

@@ -0,0 +1,44 @@
<section id="main">
<div class="page-header">
<?php if ($this->user->isAdmin()): ?>
<ul>
<li><i class="fa fa-users fa-fw"></i><?= $this->url->link(t('View all groups'), 'group', 'index') ?></li>
<li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('Add group member'), 'group', 'associate', array('group_id' => $group['id'])) ?></li>
</ul>
<?php endif ?>
</div>
<?php if ($paginator->isEmpty()): ?>
<p class="alert"><?= t('There is no user in this group.') ?></p>
<?php else: ?>
<table>
<tr>
<th><?= $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>
<th><?= t('Actions') ?></th>
</tr>
<?php foreach ($paginator->getCollection() as $user): ?>
<tr>
<td>
<?= $this->url->link('#'.$user['id'], 'user', 'show', array('user_id' => $user['id'])) ?>
</td>
<td>
<?= $this->url->link($this->e($user['username']), 'user', 'show', array('user_id' => $user['id'])) ?>
</td>
<td>
<?= $this->e($user['name']) ?>
</td>
<td>
<a href="mailto:<?= $this->e($user['email']) ?>"><?= $this->e($user['email']) ?></a>
</td>
<td>
<?= $this->url->link(t('Remove this user'), 'group', 'dissociate', array('group_id' => $group['id'], 'user_id' => $user['id'])) ?>
</td>
</tr>
<?php endforeach ?>
</table>
<?= $paginator ?>
<?php endif ?>
</section>

2
app/Template/user/create_local.php
View File

@@ -49,4 +49,4 @@
</div>
</form>
</section>
</section>
</section>

1
app/Template/user/index.php
View File

@@ -5,6 +5,7 @@
<li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New local user'), 'user', 'create') ?></li>
<li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New remote user'), 'user', 'create', array('remote' => 1)) ?></li>
<li><i class="fa fa-upload fa-fw"></i><?= $this->url->link(t('Import'), 'userImport', 'step1') ?></li>
<li><i class="fa fa-users fa-fw"></i><?= $this->url->link(t('View all groups'), 'group', 'index') ?></li>
</ul>
<?php endif ?>
</div>