From 75ca5406021052599f99d705d04439878d1cdff6 Mon Sep 17 00:00:00 2001 From: Luca Haid Date: Wed, 15 Jan 2025 09:01:45 +0100 Subject: [PATCH] fixed no filter showing all results --- application/DashboardNew/DashboardNewController.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/application/DashboardNew/DashboardNewController.php b/application/DashboardNew/DashboardNewController.php index b5868d0fd..46d2ba843 100644 --- a/application/DashboardNew/DashboardNewController.php +++ b/application/DashboardNew/DashboardNewController.php @@ -138,8 +138,10 @@ class DashboardNewController extends mfBaseController { $gemeinde_ids = $post['gemeinden'] === '' ? [] : [$post['gemeinden']] ?? []; if (!empty($netowner_ids)) { + $all_campaigns = $this->me->is("Admin") ? PreordercampaignModel::getAll() : PreordercampaignModel::search(["owner_id" => $this->me->address_id]); + $campaign_ids = empty($campaign_ids) ? - array_map(fn($campaign) => $campaign->id, PreordercampaignModel::getAll()) : + array_map(fn($campaign) => $campaign->id, $all_campaigns) : $campaign_ids; $campaign_ids = array_filter($campaign_ids, function ($campaign_id) use ($netowner_ids) { @@ -148,6 +150,11 @@ class DashboardNewController extends mfBaseController { }); } + if (empty($campaign_ids) && !$this->me->is("Admin")) { + $owner_campaigns = PreordercampaignModel::search(["owner_id" => $this->me->address_id]); + $campaign_ids = array_map(fn($campaign) => $campaign->id, $owner_campaigns); + } + $order_max_homes = $this->getTotalHomes($campaign_ids, $gemeinde_ids); $efh_connection_types = ["single-dwelling", "business"];