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

Display projects on the dashboard and board selector when everybody allowed is checked

Browse Source
This commit is contained in:
Frederic Guillot
2015-03-21 18:16:04 -04:00
parent dd066290e5
commit ed54d852db
2 changed files with 83 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Model/ProjectPermission.php
View File

@@ -316,7 +316,10 @@ class ProjectPermission extends Base
{
return $this->db
->hashtable(Project::TABLE)
->eq('user_id', $user_id)
->beginOr()
->eq(self::TABLE.'.user_id', $user_id)
->eq(Project::TABLE.'.is_everybody_allowed', 1)
->closeOr()
->join(self::TABLE, 'project_id', 'id')
->getAll('projects.id', 'name');
}
@@ -332,7 +335,10 @@ class ProjectPermission extends Base
{
return $this->db
->table(Project::TABLE)
->eq('user_id', $user_id)
->beginOr()
->eq(self::TABLE.'.user_id', $user_id)
->eq(Project::TABLE.'.is_everybody_allowed', 1)
->closeOr()
->join(self::TABLE, 'project_id', 'id')
->findAllByColumn('projects.id');
}
@@ -348,7 +354,10 @@ class ProjectPermission extends Base
{
return $this->db
->table(Project::TABLE)
->eq('user_id', $user_id)
->beginOr()
->eq(self::TABLE.'.user_id', $user_id)
->eq(Project::TABLE.'.is_everybody_allowed', 1)
->closeOr()
->eq(Project::TABLE.'.is_active', Project::ACTIVE)
->join(self::TABLE, 'project_id', 'id')
->findAllByColumn('projects.id');
@@ -365,7 +374,10 @@ class ProjectPermission extends Base
{
return $this->db
->hashtable(Project::TABLE)
->eq('user_id', $user_id)
->beginOr()
->eq(self::TABLE.'.user_id', $user_id)
->eq(Project::TABLE.'.is_everybody_allowed', 1)
->closeOr()
->eq(Project::TABLE.'.is_active', Project::ACTIVE)
->join(self::TABLE, 'project_id', 'id')
->getAll('projects.id', 'name');