Browse Source

FIX Filter on assigned to was preselected on current user on list "All
events" (instead of no filtering)

Laurent Destailleur 9 years ago
parent
commit
ed148f70b3
2 changed files with 5 additions and 5 deletions
  1. 1 1
      htdocs/comm/action/index.php
  2. 4 4
      htdocs/core/modules/modAgenda.class.php

+ 1 - 1
htdocs/comm/action/index.php

@@ -48,7 +48,7 @@ $filtert = GETPOST("usertodo","int",3)?GETPOST("usertodo","int",3):GETPOST("filt
 $usergroup = GETPOST("usergroup","int",3);
 $showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
 
-// If not choice done on calendar owner, we filter on user.
+// If not choice done on calendar owner (like on left menu link "Agenda"), we filter on user.
 if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
 {
 	$filtert=$user->id;

+ 4 - 4
htdocs/core/modules/modAgenda.class.php

@@ -266,7 +266,7 @@ class modAgenda extends DolibarrModules
 													'type'=>'left',
 													'titre'=>'MenuToDoActions',
 													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo',
+													'url'=>'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=todo&filtert=-1',
 													'langs'=>'agenda',
 													'position'=>105,
 													'perms'=>'$user->rights->agenda->allactions->read',
@@ -278,7 +278,7 @@ class modAgenda extends DolibarrModules
 													'type'=>'left',
 													'titre'=>'MenuDoneActions',
 													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done',
+													'url'=>'/comm/action/index.php?mainmenu=agenda&leftmenu=agenda&status=done&filtert=-1',
 													'langs'=>'agenda',
 													'position'=>106,
 													'perms'=>'$user->rights->agenda->allactions->read',
@@ -327,7 +327,7 @@ class modAgenda extends DolibarrModules
 													'type'=>'left',
 													'titre'=>'MenuToDoActions',
 													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo',
+													'url'=>'/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=todo&filtert=-1',
 													'langs'=>'agenda',
 													'position'=>115,
 													'perms'=>'$user->rights->agenda->allactions->read',
@@ -339,7 +339,7 @@ class modAgenda extends DolibarrModules
 													'type'=>'left',
 													'titre'=>'MenuDoneActions',
 													'mainmenu'=>'agenda',
-													'url'=>'/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=done',
+													'url'=>'/comm/action/listactions.php?mainmenu=agenda&leftmenu=agenda&status=done&filtert=-1',
 													'langs'=>'agenda',
 													'position'=>116,
 													'perms'=>'$user->rights->agenda->allactions->read',