diff --git a/Layout/default/AddressDB/Index.php b/Layout/default/AddressDB/Index.php
index 86ee2eff6..b2b71017f 100644
--- a/Layout/default/AddressDB/Index.php
+++ b/Layout/default/AddressDB/Index.php
@@ -137,8 +137,8 @@
diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php
index 033ee4aea..e4a908838 100644
--- a/Layout/default/Preorder/Index.php
+++ b/Layout/default/Preorder/Index.php
@@ -155,8 +155,8 @@
=$preorder->adb_hausnummer->hausnummer?>
=($preorder->adb_wohneinheit_id) ? ((string)$preorder->adb_wohneinheit ? $preorder->adb_wohneinheit."
" : "") : "<keine Wohneinheit>
"?>
=$preorder->adb_hausnummer->plz->plz?>
+ =$preorder->adb_hausnummer->ortschaft->name?>
=$preorder->adb_hausnummer->strasse->gemeinde->name?>
- =($preorder->address_district) ? "
(".$preorder->address_district.")" : ""?>
|
diff --git a/Layout/default/Preordercampaign/Index.php b/Layout/default/Preordercampaign/Index.php
index 69abc50fc..80d93a218 100644
--- a/Layout/default/Preordercampaign/Index.php
+++ b/Layout/default/Preordercampaign/Index.php
@@ -71,15 +71,15 @@
-
-
diff --git a/Layout/default/menu.php b/Layout/default/menu.php
index 50d52a955..c3e797ace 100644
--- a/Layout/default/menu.php
+++ b/Layout/default/menu.php
@@ -18,12 +18,15 @@
"> News
+
+ is(["Admin", "netowner"])): ?>
diff --git a/application/AddressDB/AddressDBController.php b/application/AddressDB/AddressDBController.php
index 4d99c2550..2df3e576b 100644
--- a/application/AddressDB/AddressDBController.php
+++ b/application/AddressDB/AddressDBController.php
@@ -56,7 +56,7 @@ class AddressDBController extends mfBaseController {
$my_adb_networks[$network->adb_netzgebiet_id] = new ADBNetzgebiet($network->adb_netzgebiet_id);
}
}
- //var_dump($filter, $my_adb_networks);
+ //var_dump($my_networks, $my_adb_networks);
if(!$this->me->is("Admin") && array_key_exists("network_id", $filter)) {
if(array_key_exists($filter['network_id'], $my_adb_networks)) {
$filter['netzgebiet_id'] = $filter['network_id'];
@@ -70,7 +70,7 @@ class AddressDBController extends mfBaseController {
if(!array_key_exists("netzgebiet_id", $addressdb_filter)) {
$addressdb_filter['netzgebiet_id'] = $netzgebiet_ids;
}
-
+ //var_dump($my_adb_networks);exit;
$this->layout()->set("my_networks", ADBNetzgebietModel::getAll());
$this->layout()->set("my_adb_networks", $my_adb_networks);
//var_dump($addressdb_filter);exit;
diff --git a/application/Network/NetworkModel.php b/application/Network/NetworkModel.php
index 03e3c7bf2..ee5f47946 100644
--- a/application/Network/NetworkModel.php
+++ b/application/Network/NetworkModel.php
@@ -1,15 +1,16 @@
'liezen%']) as $adb_netzgebiet) {
$network = NetworkModel::create([
'owner_id' => $owner_id,
+ 'adb_netzgebiet_id' => $adb_netzgebiet->id,
'name' => $name,
'note' => $note,
'sytemowner_action_status' => "term_connected",