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

Add projects to the dashboard and rename some methods

Browse Source
This commit is contained in:
Frédéric Guillot
2014-11-09 12:47:49 -05:00
parent e0117cb8ed
commit 3df63e051f
30 changed files with 262 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/Model/Project.php
View File

@@ -95,6 +95,40 @@ class Project extends Base
return (bool) $this->db->table(self::TABLE)->eq('id', $project_id)->eq('is_private', 1)->count();
}
/**
* Get project summary for a list of project (number of tasks for each column)
*
* @access public
* @param array $project_ids List of project id
* @param integer $status Project status
* @param string $order Sort on this column
* @param string $direction Sorting direction
* @return array Project properties
*/
public function getSummary(array $project_ids, $status = self::ACTIVE, $order = 'last_modified', $direction = 'desc')
{
if (empty($project_ids)) {
return array();
}
$projects = $this->db->table(self::TABLE)
->in('id', $project_ids)
->eq('is_active', $status)
->orderby($order, $direction)
->findAll();
foreach ($projects as &$project) {
$project['columns'] = $this->board->getColumns($project['id']);
foreach ($project['columns'] as &$column) {
$column['nb_tasks'] = $this->taskFinder->countByColumnId($project['id'], $column['id']);
}
}
return $projects;
}
/**
* Get all projects, optionaly fetch stats for each project and can check users permissions
*
@@ -192,7 +226,7 @@ class Project extends Base
public function getStats($project_id)
{
$stats = array();
$columns = $this->board->getcolumns($project_id);
$columns = $this->board->getColumns($project_id);
$stats['nb_active_tasks'] = 0;
foreach ($columns as &$column) {

52
app/Model/ProjectPermission.php
View File

@@ -29,9 +29,9 @@ class ProjectPermission extends Base
* @param bool $prepend_everybody Prepend the 'Everbody' value
* @return array
*/
public function getUsersList($project_id, $prepend_unassigned = true, $prepend_everybody = false)
public function getMemberList($project_id, $prepend_unassigned = true, $prepend_everybody = false)
{
$allowed_users = $this->getAllowedUsers($project_id);
$allowed_users = $this->getMembers($project_id);
if ($prepend_unassigned) {
$allowed_users = array(t('Unassigned')) + $allowed_users;
@@ -51,7 +51,7 @@ class ProjectPermission extends Base
* @param integer $project_id Project id
* @return array
*/
public function getAllowedUsers($project_id)
public function getMembers($project_id)
{
if ($this->isEverybodyAllowed($project_id)) {
return $this->user->getList();
@@ -96,7 +96,7 @@ class ProjectPermission extends Base
$all_users = $this->user->getList();
$users['allowed'] = $this->getAllowedUsers($project_id);
$users['allowed'] = $this->getMembers($project_id);
foreach ($all_users as $user_id => $username) {
@@ -141,19 +141,15 @@ class ProjectPermission extends Base
}
/**
* Check if a specific user is allowed to access to a given project
* Check if a specific user is member of a project
*
* @access public
* @param integer $project_id Project id
* @param integer $user_id User id
* @return bool
*/
public function isUserAllowed($project_id, $user_id)
public function isMember($project_id, $user_id)
{
if ($this->user->isAdmin($user_id)) {
return true;
}
if ($this->isEverybodyAllowed($project_id)) {
return true;
}
@@ -165,6 +161,19 @@ class ProjectPermission extends Base
->count();
}
/**
* Check if a specific user is allowed to access to a given project
*
* @access public
* @param integer $project_id Project id
* @param integer $user_id User id
* @return bool
*/
public function isUserAllowed($project_id, $user_id)
{
return $this->user->isAdmin($user_id) || $this->isMember($project_id, $user_id);
}
/**
* Return true if everybody is allowed for the project
*
@@ -204,12 +213,13 @@ class ProjectPermission extends Base
* @access public
* @param array $projects Project list: ['project_id' => 'project_name']
* @param integer $user_id User id
* @param string $filter Method name to apply
* @return array
*/
public function filterProjects(array $projects, $user_id)
public function filterProjects(array $projects, $user_id, $filter = 'isUserAllowed')
{
foreach ($projects as $project_id => $project_name) {
if (! $this->isUserAllowed($project_id, $user_id)) {
if (! $this->$filter($project_id, $user_id)) {
unset($projects[$project_id]);
}
}
@@ -218,7 +228,7 @@ class ProjectPermission extends Base
}
/**
* Return a list of projects for a given user
* Return a list of allowed projects for a given user
*
* @access public
* @param integer $user_id User id
@@ -226,7 +236,19 @@ class ProjectPermission extends Base
*/
public function getAllowedProjects($user_id)
{
return $this->filterProjects($this->project->getListByStatus(Project::ACTIVE), $user_id);
return $this->filterProjects($this->project->getListByStatus(Project::ACTIVE), $user_id, 'isUserAllowed');
}
/**
* Return a list of projects where the user is member
*
* @access public
* @param integer $user_id User id
* @return array
*/
public function getMemberProjects($user_id)
{
return $this->filterProjects($this->project->getListByStatus(Project::ACTIVE), $user_id, 'isMember');
}
/**
@@ -239,7 +261,7 @@ class ProjectPermission extends Base
*/
public function duplicate($project_from, $project_to)
{
$users = $this->getAllowedUsers($project_from);
$users = $this->getMembers($project_from);
foreach ($users as $user_id => $name) {
if (! $this->allowUser($project_to, $user_id)) {