From e9d5b44009a3e96abbba9b9d6a1e7348d4224e9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
<marcosgdf@gmail.com>
Date: Sun, 12 Mar 2017 15:31:39 +0100
Subject: [PATCH] Fixed Project counter showing total amount of projects
instead of just the projects current user can see
---
htdocs/projet/class/project.class.php | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 1de78f46021..15170a23cbc 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -3,7 +3,7 @@
* Copyright (C) 2005-2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2010 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
- * Copyright (C) 2014-2015 Marcos García <marcosgdf@gmail.com>
+ * Copyright (C) 2014-2017 Marcos García <marcosgdf@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -1689,17 +1689,21 @@ class Project extends CommonObject
*/
function load_state_board()
{
- global $conf;
+ global $user;
$this->nb=array();
-
- $sql = "SELECT count(u.rowid) as nb";
- $sql.= " FROM ".MAIN_DB_PREFIX."projet as u";
- $sql.= " WHERE";
- //$sql.= " WHERE u.fk_statut > 0";
- //$sql.= " AND employee != 0";
- $sql.= " u.entity IN (".getEntity('projet', 1).")";
-
+
+ $sql = "SELECT DISTINCT
+ count(p.rowid) as nb
+FROM ".MAIN_DB_PREFIX."projet AS p LEFT JOIN ".MAIN_DB_PREFIX."societe AS s ON p.fk_soc = s.rowid
+ LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status AS cls ON p.fk_opp_status = cls.rowid
+WHERE p.entity IN (".getEntity('projet', 1).")";
+
+ if (! $user->rights->projet->all->lire) {
+ $projectsListId = $this->getProjectsAuthorizedForUser($user,0,1);
+ $sql .= "AND p.rowid IN (".$projectsListId.")";
+ }
+
$resql=$this->db->query($sql);
if ($resql)
{
--
GitLab