From e506648cbcda0b6021cf0a3b5e2f6381d8f1d0ea Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sun, 25 Jan 2015 11:55:12 -0500 Subject: Do not show inactive projects info on the dashboard and update picodb (merge #546) --- app/Model/ProjectPermission.php | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'app/Model/ProjectPermission.php') diff --git a/app/Model/ProjectPermission.php b/app/Model/ProjectPermission.php index 02f3b428..352677d9 100644 --- a/app/Model/ProjectPermission.php +++ b/app/Model/ProjectPermission.php @@ -315,10 +315,27 @@ class ProjectPermission extends Base public function getMemberProjects($user_id) { return $this->db - ->table(Project::TABLE) + ->hashtable(Project::TABLE) + ->eq('user_id', $user_id) + ->join(self::TABLE, 'project_id', 'id') + ->getAll('projects.id', 'name'); + } + + /** + * Return a list of active projects where the user is member + * + * @access public + * @param integer $user_id User id + * @return array + */ + public function getActiveMemberProjects($user_id) + { + return $this->db + ->hashtable(Project::TABLE) ->eq('user_id', $user_id) + ->eq(Project::TABLE.'.is_active', Project::ACTIVE) ->join(self::TABLE, 'project_id', 'id') - ->listing('projects.id', 'name'); + ->getAll('projects.id', 'name'); } /** -- cgit v1.2.3