Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Added permission checks for Buildings and terminations

Browse Source
This commit is contained in:
Frank Schubert
2021-08-05 20:11:15 +02:00
parent 4a74e15300
commit c06bb156c7
18 changed files with 246 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
application/Building/BuildingController.php
View File

@@ -9,7 +9,7 @@ class BuildingController extends mfBaseController {
$this->me = $me;
$this->layout()->set("me",$me);
if(!$me->isAdmin()) {
if(!$me->is(["Admin", "netowner", "pipeplanner"])) {
$this->redirect("Dashboard");
}
}
@@ -21,12 +21,43 @@ class BuildingController extends mfBaseController {
protected function addAction() {
$this->layout()->setTemplate("Building/Form");
$this->layout()->set("networks", NetworkModel::getAll());
if($this->me->isAdmin()) {
$this->layout()->set("networks", NetworkModel::getAll());
$this->layout()->set("pipeworkers", AddressModel::search(["addresstype" => ["pipeworker"]])); // change to NetworkaddressModel
$this->layout()->set("lineworkers", AddressModel::search(["addresstype" => ["lineworker"]])); // change to NetworkaddressModel
} else {
$this->layout()->set("networks", $this->me->my_networks);
$pipeworkers = [];
$lineworkers = [];
foreach($this->me->my_networks as $network) {
//var_dump($network->addresstypes);exit;
if(is_array($network->addresstypes)) {
foreach($network->getTypeAddresses("pipeworker") as $address) {
if(!array_key_exists($address->id, $pipeworkers)) {
$pipeworkers[$address->id] = $address;
}
}
foreach($network->getTypeAddresses("lineworker") as $address) {
if(!array_key_exists($address->id, $lineworkers)) {
$lineworkers[$address->id] = $address;
}
}
}
}
$this->layout()->set("pipeworkers", $pipeworkers); // change to NetworkaddressModel
$this->layout()->set("lineworkers", $lineworkers); // change to NetworkaddressModel
}
$this->layout()->set("types", BuildingtypeModel::getAll());
$this->layout()->set("statuses", BuildingstatusModel::getAll());
$this->layout()->set("pipeworkers", AddressModel::search(["addresstype" => ["pipeworker"]]));
$this->layout()->set("lineworkers", AddressModel::search(["addresstype" => ["lineworker"]]));
$this->layout()->set("networksections", NetworksectionModel::getAll());
}
protected function editAction() {
@@ -71,7 +102,7 @@ class BuildingController extends mfBaseController {
$data['network_id'] = $r->network_id;
$data['pop_id'] = ($r->pop_id) ? $r->pop_id : null;
$data['type_id'] = $r->type_id;
$data['status_id'] = ($r->status_id) ? $r->status_id : null;
$data['status_id'] = ($r->status_id) ? $r->status_id : 1;
$data['pipeworker_id'] = ($r->pipeworker_id) ? $r->pipeworker_id : null;
$data['lineworker_id'] = ($r->lineworker_id) ? $r->lineworker_id : null;
$data['networksection_id'] = ($r->networksection_id) ? $r->networksection_id : null;
@@ -98,7 +129,6 @@ class BuildingController extends mfBaseController {
}
if($mode == "add") {
$data['status_id'] = 1;
$data['create_by'] = 1;
$building = BuildingModel::create($data);
} else {
@@ -141,7 +171,8 @@ class BuildingController extends mfBaseController {
}
// Anschlüsse anlegen
if($building->units > 0) {
if(!$building->terminations && $building->units > 0) {
for($i = 1; $i <= $building->units; $i++) {
$data = [];
$data['building_id'] = $building->id;