From 076adfb4063798c16ec5834b88df334d52887ef2 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Mon, 12 Sep 2022 13:24:27 +0200
Subject: [PATCH] minor change to gemeinde selection in Preordercampaign

---
 Layout/default/Preordercampaign/Form.php                    | 4 ++--
 application/Preordercampaign/PreordercampaignController.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Layout/default/Preordercampaign/Form.php b/Layout/default/Preordercampaign/Form.php
index a01e48a32..20c23deca 100644
--- a/Layout/default/Preordercampaign/Form.php
+++ b/Layout/default/Preordercampaign/Form.php
@@ -116,11 +116,11 @@
               <div class="card">
                 <div class="card-body">
                   <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="adb_gemeinde_ids">Zugelassene Gemeinden</label>
+                    <label class="col-lg-2 col-form-label" for="adb_gemeinde_ids">Beschränkt auf GWR-Gemeinden</label>
                     <div class="col-lg-10">
                       <select class="select2 form-control select2-multiple" name="adb_gemeinde_ids[]" id="adb_gemeinde_ids" multiple="multiple" data-placeholder="Gemeinden ...">
                         <?php foreach(ADBGemeindeModel::getAll() as $gemeinde): ?>
-                          <option value="<?=$gemeinde->id?>" <?=(array_key_exists($gemeinde->id, $campaign->gemeinden)) ? "selected='selected'" : ""?>><?=$gemeinde->name?></option>
+                          <option value="<?=$gemeinde->id?>" <?=(is_array($campaign->gemeinden) && array_key_exists($gemeinde->id, $campaign->gemeinden)) ? "selected='selected'" : ""?>><?=$gemeinde->name?></option>
                         <?php endforeach; ?>
                       </select>
                     </div>
diff --git a/application/Preordercampaign/PreordercampaignController.php b/application/Preordercampaign/PreordercampaignController.php
index a921116a5..abe56c549 100644
--- a/application/Preordercampaign/PreordercampaignController.php
+++ b/application/Preordercampaign/PreordercampaignController.php
@@ -181,10 +181,10 @@ class PreordercampaignController extends mfBaseController {
     }
     
     //var_dump($r->adb_gemeinde_ids);exit;
+    foreach(PreordercampaignGemeindeModel::search(['preordercampaign_id' => $campaign->id]) as $pcg) {
+      $pcg->delete();
+    }
     if(is_array($r->adb_gemeinde_ids) && count($r->adb_gemeinde_ids)) {
-      foreach(PreordercampaignGemeindeModel::search(['preordercampaign_id' => $campaign->id]) as $pcg) {
-        $pcg->delete();
-      }
       foreach($r->adb_gemeinde_ids as $gemeinde_id) {
         $pcg = PreordercampaignGemeindeModel::getFirst(['preordercampaign_id' => $campaign->id, 'gemeinde_id' => $gemeinde_id]);
         if($pcg) continue;