Merge branch 'fronkdev' into 'master'

Fixed ADBHausnummer::count() with joins sql

See merge request fronk/thetool!1462
This commit is contained in:
Frank Schubert
2025-06-13 03:20:40 +00:00
@@ -83,10 +83,10 @@ class AddressDBController extends mfBaseController {
if(array_key_exists("netzgebiet_id", $filter) && $filter['netzgebiet_id'] === "null") {
$addressdb_filter['netzgebiet_id'] = 0;
$pagination['maxItems'] = ADBHausnummerModel::count($addressdb_filter);
$pagination['maxItems'] = ADBHausnummerModel::count($addressdb_filter, true);
$addresses = ADBHausnummerModel::search($addressdb_filter, $pagination);
} else if(count($my_adb_networks)) {
$pagination['maxItems'] = ADBHausnummerModel::count($addressdb_filter);
$pagination['maxItems'] = ADBHausnummerModel::count($addressdb_filter, true);
$addresses = ADBHausnummerModel::search($addressdb_filter, $pagination);
}
$this->layout()->set("pagination", $pagination);