From 73fe342497ffb3605d3c25a4cd094fdc73962988 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Thu, 12 Jun 2025 14:42:12 +0200
Subject: [PATCH] fixed preorder issue

---
 Layout/default/AddressDB/Index.php            | 5 +++--
 application/AddressDB/AddressDBController.php | 9 ++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Layout/default/AddressDB/Index.php b/Layout/default/AddressDB/Index.php
index a18723d6e..7e6d30357 100644
--- a/Layout/default/AddressDB/Index.php
+++ b/Layout/default/AddressDB/Index.php
@@ -38,10 +38,10 @@
                 
                 <div class="col-2">
                   <label class="form-label" for="filter_network_id">Netzgebiet</label>
-                  <select name="filter[network_id]" id="filter_network_id" class="form-control">
+                  <select multiple name="filter[network_id][]" id="filter_network_id" class="form-control">
                     <option></option>
                     <?php foreach($my_adb_networks as $fnet): ?>
-                    <option value="<?=$fnet->id?>" <?=(array_key_exists("network_id", $filter) && $filter['network_id'] == $fnet->id) ? "selected='selected'" : ""?>><?=$fnet->name?></option>
+                    <option value="<?=$fnet->id?>" <?=(array_key_exists("network_id", $filter) && (is_array($filter['network_id']) && in_array($fnet->id, $filter['network_id']) || $filter['network_id'] == $fnet->id)) ? "selected='selected'" : ""?>><?=$fnet->name?></option>
                     <?php endforeach; ?>
                     <?php if($me->isAdmin()):?><option value="null"  <?=(array_key_exists("network_id", $filter) && $filter['network_id'] === "null") ? 'selected="selected"' : ""?>>-- Kein Netzgebiet --</option><?php endif; ?>
                   </select>
@@ -273,6 +273,7 @@
     <script>
         $("#filter_status_id").select2({closeOnSelect: false});
         $("#filter_status_flag").select2({closeOnSelect: false});
+        $("#filter_network_id").select2({closeOnSelect: false});
 
       $('#filter_network_id').change(function() {
         if($('#filter_network_id').val() === "null") {
diff --git a/application/AddressDB/AddressDBController.php b/application/AddressDB/AddressDBController.php
index 92b7cedcc..bf8146799 100644
--- a/application/AddressDB/AddressDBController.php
+++ b/application/AddressDB/AddressDBController.php
@@ -179,13 +179,20 @@ class AddressDBController extends mfBaseController {
           }
           unset($filter["status_id"]);
       }
-    
+
       if(array_key_exists("status_flag", $filter)) {
           if(is_array($filter["status_flag"])) {
               $new_filter["status_flag"] = $filter["status_flag"];
           }
           unset($filter["status_flag"]);
       }
+
+      if(array_key_exists("network_id", $filter)) {
+          if(is_array($filter["network_id"])) {
+              $new_filter["netzgebiet_id"] = $filter["network_id"];
+          }
+          unset($filter["network_id"]);
+      }
     
     if(is_array($filter) && count($filter)) {
         foreach($filter as $name => $value) {