diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index 3c831348c7a..a6a745ad25c 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -50,8 +50,8 @@ $langs->load("projects"); $now = dol_now(); $projectstatic=new Project($db); -//$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1); -$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1); // Return all project i have permission on. I want my tasks and some of my task may be on a public projet that is not my project +//$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,($mine?$mine:($user->rights->projet->all->lire?2:0)),1); +$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1); // Return all projects I have permission on because I want my tasks and some of my task may be on a public projet that is not my project $title=$langs->trans("Activities"); if ($mine) $title=$langs->trans("MyActivities"); diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index d78bcbbd1a7..150832351af 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -787,7 +787,7 @@ class Project extends CommonObject * Return array of projects a user has permission on, is affected to, or all projects * * @param user User object - * @param mode 0=All project I have permission on, 1=Projects affected to me only, 2=Will return list of all projects + * @param mode 0=All project I have permission on, 1=Projects affected to me only, 2=Will return list of all projects with no test on contacts * @param list 0=Return array,1=Return string list * @param socid 0=No filter on third party, id of third party * @return array or string diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 87221b24e9a..8cb41a7c850 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -48,9 +48,10 @@ if (!$user->rights->projet->lire) accessforbidden(); $socstatic=new Societe($db); $projectstatic=new Project($db); -$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1); +$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,($mine?$mine:($user->rights->projet->all->lire?2:0)),1); //var_dump($projectsListId); + llxHeader("",$langs->trans("Projects"),"EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos"); $text=$langs->trans("Projects"); @@ -69,7 +70,7 @@ else print ''; print '
'; -print_projecttasks_array($db,$mine,$socid,$projectsListId); +print_projecttasks_array($db,$socid,$projectsListId); print '';