From 67ed1e0841f5fa5fccdaec378ead6b3127a8b1ba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 16 May 2018 20:59:45 +0200
Subject: [PATCH] Fix filter criteria when using backto for events

---
 htdocs/comm/action/card.php                   |  2 +-
 htdocs/comm/action/class/actioncomm.class.php | 24 ++++++++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index fb9c5944baf..e13b6bc382f 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1291,7 +1291,7 @@ if ($id > 0)
 		}
 
 		$linkback =img_picto($langs->trans("BackToList"),'object_list','class="hideonsmartphone pictoactionview"');
-		$linkback.= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php">'.$langs->trans("BackToList").'</a>';
+		$linkback.= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 		// Link to other agenda views
 		$out='';
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 261948ab190..be9c6f98489 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1203,15 +1203,16 @@ class ActionComm extends CommonObject
      *    	Return URL of event
      *      Use $this->id, $this->type_code, $this->label and $this->type_label
      *
-     * 		@param	int		$withpicto			0=No picto, 1=Include picto into link, 2=Only picto
-     *		@param	int		$maxlength			Max number of charaters into label. If negative, use the ref as label.
-     *		@param	string	$classname			Force style class on a link
-     * 		@param	string	$option				''=Link to action, 'birthday'=Link to contact
-     * 		@param	int		$overwritepicto		1=Overwrite picto
-     *      @param	int   	$notooltip		    1=Disable tooltip
-     *		@return	string						Chaine avec URL
+     * 		@param	int		$withpicto				0=No picto, 1=Include picto into link, 2=Only picto
+     *		@param	int		$maxlength				Max number of charaters into label. If negative, use the ref as label.
+     *		@param	string	$classname				Force style class on a link
+     * 		@param	string	$option					''=Link to action, 'birthday'=Link to contact
+     * 		@param	int		$overwritepicto			1=Overwrite picto
+     *      @param	int   	$notooltip		    	1=Disable tooltip
+     *  	@param  int     $save_lastsearch_value  -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+     *		@return	string							Chaine avec URL
      */
-    function getNomUrl($withpicto=0,$maxlength=0,$classname='',$option='',$overwritepicto=0, $notooltip=0)
+    function getNomUrl($withpicto=0, $maxlength=0, $classname='', $option='', $overwritepicto=0, $notooltip=0, $save_lastsearch_value=-1)
     {
 		global $conf, $langs, $user, $hookmanager, $action;
 
@@ -1275,6 +1276,13 @@ class ActionComm extends CommonObject
 			$url = DOL_URL_ROOT.'/contact/perso.php?id='.$this->id;
 		else
 			$url = DOL_URL_ROOT.'/comm/action/card.php?id='.$this->id;
+		if ($option !== 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
+			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart.=$linkclose.'>';