From 232f825d94ca49231333e4fdbf1622c3c6ae8491 Mon Sep 17 00:00:00 2001
From: Nestor <npegane@hotmail.com>
Date: Wed, 29 Nov 2017 14:50:08 +0100
Subject: [PATCH] FIX #6470 conditions added to change ajax call parameter

---
 .../class/class_lists_Abstract.php            | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/apps/maarch_entreprise/class/class_lists_Abstract.php b/apps/maarch_entreprise/class/class_lists_Abstract.php
index bc9f2ed9f3b..78dbff0555f 100755
--- a/apps/maarch_entreprise/class/class_lists_Abstract.php
+++ b/apps/maarch_entreprise/class/class_lists_Abstract.php
@@ -230,9 +230,16 @@ abstract class lists_Abstract extends Database
                         $checked =  '';
                   }
                     
-                $filters .='<input type="checkbox" '.$checked.' style="margin-left:0px" title="inclure les sous-entités" onclick="loadList(\''.$this->link
-                            .'&filter=entity_subentities&value=\' + document.filters.entity_id.value, \''
-                            .$this->divListId.'\', '.$this->modeReturn.');" />&nbsp;';
+                  if($_SESSION['filters']['entity_subentities']['checked']){
+                        $filters .='<input type="checkbox" '.$checked.' style="margin-left:0px" title="inclure les sous-entités" onclick="loadList(\''.$this->link
+                        .'&filter=entity&value=\' + document.filters.entity_id.value, \''
+                        .$this->divListId.'\', '.$this->modeReturn.');" />&nbsp;';
+                    } else {
+                        $filters .='<input type="checkbox" '.$checked.' style="margin-left:0px" title="inclure les sous-entités" onclick="loadList(\''.$this->link
+                        .'&filter=entity_subentities&value=\' + document.filters.entity_id.value, \''
+                        .$this->divListId.'\', '.$this->modeReturn.');" />&nbsp;';
+                    }
+
 
             break;
             
@@ -723,8 +730,15 @@ abstract class lists_Abstract extends Database
                     } else if ($_REQUEST['filter'] == 'entity_subentities') {
 
                         //$_SESSION['filters']['entity']['VALUE'] = '';
-                        $_SESSION['filters']['entity']['CLAUSE'] = '';
-                        $_SESSION['filters']['entity_subentities']['checked'] = true;
+                        if($_SESSION['filters']['entity_subentities']['checked'] == true){
+                            
+                            $_SESSION['filters']['entity_subentities']['checked'] = false;
+                            $_SESSION['filters']['entity_subentities']['VALUE'] = '';
+                            $_SESSION['filters']['entity_subentities']['CLAUSE'] = '';
+                        } else {
+                            $_SESSION['filters']['entity']['CLAUSE'] = '';
+                            $_SESSION['filters']['entity_subentities']['checked'] = true;                            
+                        }
 
                         require_once "modules" . DIRECTORY_SEPARATOR . "entities" . DIRECTORY_SEPARATOR
                             . "class" . DIRECTORY_SEPARATOR . "class_manage_entities.php";
-- 
GitLab