lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Bad filter

Browse Source
This commit is contained in:
Laurent Destailleur 2011-04-19 23:21:10 +00:00
parent 3a3429c4bb
commit ccbc95eb2a
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/projet/activity/index.php
View File

@ -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");

2
htdocs/projet/class/project.class.php
View File

@ -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

5
htdocs/projet/index.php
View File

@ -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 '<table border="0" width="100%" class="notopnoleftnoright">';
print '<tr><td width="30%" valign="top" class="notopnoleft">';
print_projecttasks_array($db,$mine,$socid,$projectsListId);
print_projecttasks_array($db,$socid,$projectsListId);
print '</td><td width="70%" valign="top" class="notopnoleft">';