Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

fixed preorder issue

Browse Source
This commit is contained in:
Luca Haid
2025-06-12 14:42:12 +02:00
parent dc7aa61155
commit 73fe342497
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Layout/default/AddressDB/Index.php
View File

@@ -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") {

9
application/AddressDB/AddressDBController.php
View File

@@ -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) {