updated Address filter

application/Address/AddressController.php

@@ -24,9 +24,22 @@ class AddressController extends mfBaseController {
       $rfilter["addresstype"] = [];
     }
     
-    $this->layout->set("filter", $rfilter);
+    if($this->request->resetFilter) {
+      unset($_SESSION[MFAPPNAME.'-Address-filter']);
+    }
     
-    $filter = $this->getPreparedFilter($rfilter);
+    $filter = [];
+    if(is_array($this->request->filter)) {
+      $filter = $this->request->filter;
+      $_SESSION[MFAPPNAME.'-Address-filter'] = $filter;
+    } else {
+      if(array_key_exists(MFAPPNAME.'-Address-filter', $_SESSION) && count($_SESSION[MFAPPNAME.'-Address-filter'])) {
+        $filter = $_SESSION[MFAPPNAME.'-Address-filter'];
+      }
+    }
+    
+    $this->layout->set("filter", $filter);
+    $filter = $this->getPreparedFilter($filter);
     
     // pagination defaults
     $pagination = [];
@@ -54,22 +67,6 @@ class AddressController extends mfBaseController {
     $this->layout()->set("last_bmd_export", $last_export);
     
     return true;
-
-
-
-    //var_dump($this->request->filter);
-    $default_filter = ['parents_only' => 1];
-    if(is_array($this->request->filter) && count($this->request->filter)) {
-      $filter = array_merge($default_filter, $this->request->filter);
-    } else {
-      $filter = $default_filter;
-    }
-    //var_dump($filter);exit;
-    $addresses = AddressModel::search($filter);
-    
-    $this->layout()->set("addresses", $addresses);
-    $this->layout()->set("filter", $filter);
-    $this->layout()->set("request", $this->request);
   }
   
   
@@ -634,16 +631,12 @@ class AddressController extends mfBaseController {
     if($r->s) {
       $query['s'] = $r->s;
     }
-    if($r->filter) {
-      $query["filter"] = $r->filter;
-    }
     if($r->return != "index") {
       $query['id'] = $new_id;
     }
     
     $qs = http_build_query($query);
     
-    
     $this->layout()->setFlash("Adresse erfolgreich gespeichert.", "success");
     if($r->return == "index") {
       $this->redirect("Address", "Index", $qs);