diff --git a/application/ADBWohneinheit/ADBWohneinheitController.php b/application/ADBWohneinheit/ADBWohneinheitController.php index 50f093d7a..7924eaebd 100644 --- a/application/ADBWohneinheit/ADBWohneinheitController.php +++ b/application/ADBWohneinheit/ADBWohneinheitController.php @@ -28,7 +28,10 @@ class ADBWohneinheitController extends mfBaseController { foreach($my_networks as $network) { if($network->adb_netzgebiet_id && !in_array($network->adb_netzgebiet_id, $netzgebiet_ids)) { $netzgebiet_ids[] = $network->adb_netzgebiet_id; - $my_adb_networks[$network->adb_netzgebiet_id] = new ADBNetzgebiet($network->adb_netzgebiet_id); + + $adb_network = new ADBNetzgebiet($network->adb_netzgebiet_id); + if(!$adb_network->isLoaded()) continue; + $my_adb_networks[$network->adb_netzgebiet_id] = $adb_network; } } $this->layout()->set("my_adb_networks", $my_adb_networks); diff --git a/application/AddressDB/AddressDBController.php b/application/AddressDB/AddressDBController.php index 5de50426e..967d56181 100644 --- a/application/AddressDB/AddressDBController.php +++ b/application/AddressDB/AddressDBController.php @@ -1,7 +1,7 @@ needlogin=true; $me = new User(); @@ -66,7 +66,10 @@ class AddressDBController extends mfBaseController { foreach($my_networks as $network) { if($network->adb_netzgebiet_id && !in_array($network->adb_netzgebiet_id, $netzgebiet_ids)) { $netzgebiet_ids[] = $network->adb_netzgebiet_id; - $my_adb_networks[$network->adb_netzgebiet_id] = new ADBNetzgebiet($network->adb_netzgebiet_id); + + $adb_network = new ADBNetzgebiet($network->adb_netzgebiet_id); + if(!$adb_network->isLoaded()) continue; + $my_adb_networks[$network->adb_netzgebiet_id] = $adb_network; } } //var_dump($my_networks, $my_adb_networks); @@ -260,7 +263,10 @@ class AddressDBController extends mfBaseController { foreach($my_networks as $network) { if($network->adb_netzgebiet_id && !in_array($network->adb_netzgebiet_id, $netzgebiet_ids)) { $netzgebiet_ids[] = $network->adb_netzgebiet_id; - $my_adb_networks[$network->adb_netzgebiet_id] = new ADBNetzgebiet($network->adb_netzgebiet_id); + + $adb_network = new ADBNetzgebiet($network->adb_netzgebiet_id); + if(!$adb_network->isLoaded()) continue; + $my_adb_networks[$network->adb_netzgebiet_id] = $adb_network; } } $this->layout()->set("my_adb_networks", $my_adb_networks); @@ -503,7 +509,10 @@ class AddressDBController extends mfBaseController { foreach($my_networks as $network) { if($network->adb_netzgebiet_id && !in_array($network->adb_netzgebiet_id, $netzgebiet_ids)) { $netzgebiet_ids[] = $network->adb_netzgebiet_id; - $my_adb_networks[$network->adb_netzgebiet_id] = new ADBNetzgebiet($network->adb_netzgebiet_id); + + $adb_network = new ADBNetzgebiet($network->adb_netzgebiet_id); + if(!$adb_network->isLoaded()) continue; + $my_adb_networks[$network->adb_netzgebiet_id] = $adb_network; } } diff --git a/application/Api/v1/PreorderApicontroller.php b/application/Api/v1/PreorderApicontroller.php index 881d7e9ea..cd4dc8437 100644 --- a/application/Api/v1/PreorderApicontroller.php +++ b/application/Api/v1/PreorderApicontroller.php @@ -136,7 +136,10 @@ class PreorderApicontroller extends mfBaseApicontroller { foreach($my_networks as $network) { if($network->adb_netzgebiet_id && !in_array($network->adb_netzgebiet_id, $netzgebiet_ids)) { $netzgebiet_ids[] = $network->id; - $my_adb_networks[$network->adb_netzgebiet_id] = new ADBNetzgebiet($network->adb_netzgebiet_id); + + $adb_network = new ADBNetzgebiet($network->adb_netzgebiet_id); + if(!$adb_network->isLoaded()) continue; + $my_adb_networks[$network->adb_netzgebiet_id] = $adb_network; } } $preorder_filter = []; diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php index c36ae68d4..be1895d7b 100644 --- a/application/Preorder/PreorderController.php +++ b/application/Preorder/PreorderController.php @@ -992,7 +992,9 @@ class PreorderController extends mfBaseController { foreach($my_networks as $network) { if($network->adb_netzgebiet_id && !in_array($network->id, $netzgebiet_ids)) { $netzgebiet_ids[] = $network->id; - $my_adb_networks[$network->adb_netzgebiet_id] = new ADBNetzgebiet($network->adb_netzgebiet_id); + $adb_network = new ADBNetzgebiet($network->adb_netzgebiet_id); + if(!$adb_network->isLoaded()) continue; + $my_adb_networks[$network->adb_netzgebiet_id] = $adb_network; } } diff --git a/application/Preordercampaign/Preordercampaign.php b/application/Preordercampaign/Preordercampaign.php index 59f39398d..cfbcc99ce 100644 --- a/application/Preordercampaign/Preordercampaign.php +++ b/application/Preordercampaign/Preordercampaign.php @@ -192,7 +192,9 @@ class Preordercampaign extends mfBaseModel { if($name == "salesclusters") { $items = PreordercampaignSalesclusterModel::search(["preordercampaign_id" => $this->id]); foreach($items as $pog) { - $this->salesclusters[$pog->salescluster_id] = new ADBNetzgebiet($pog->salescluster_id); + $sc = new ADBNetzgebiet($pog->salescluster_id); + if(!$sc->id) continue; + $this->salesclusters[$pog->salescluster_id] = $sc; } return $this->salesclusters; }