Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix filter on current user is stupi on the view "per user".

Browse Source
This commit is contained in:
Laurent Destailleur
2020-02-06 21:16:48 +01:00
parent 19847ec7ac
commit fe0d1a81eb
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/action/peruser.php
View File

@@ -49,10 +49,10 @@ $usergroup = GETPOST("search_usergroup", "int", 3) ?GETPOST("search_usergroup",
$showbirthday = 0; $showbirthday = 0;
// If not choice done on calendar owner, we filter on user. // If not choice done on calendar owner, we filter on user.
if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS)) /*if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
{ {
$filtert = $user->id; $filtert = $user->id;
} }*/
$sortfield = GETPOST("sortfield", 'alpha'); $sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha'); $sortorder = GETPOST("sortorder", 'alpha');

4
htdocs/core/lib/agenda.lib.php
View File

@@ -545,7 +545,9 @@ function calendars_prepare_head($param)
$h++; $h++;
} }
$head[$h][0] = DOL_URL_ROOT.'/comm/action/peruser.php'.($param?'?'.$param:''); $newparam = $param;
$newparam = preg_replace('/&?search_filtert=\d+/', '', $newparam);
$head[$h][0] = DOL_URL_ROOT.'/comm/action/peruser.php'.($newparam?'?'.$newparam:'');
$head[$h][1] = $langs->trans("ViewPerUser"); $head[$h][1] = $langs->trans("ViewPerUser");
$head[$h][2] = 'cardperuser'; $head[$h][2] = 'cardperuser';
$h++; $h++;