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
Layout/default/Building/Form.php
+6 -13
View File
@@ -83,12 +83,14 @@
</div>
</div>
<?php if($building->id): ?>
<div class="form-group row" id="gps-again" style="display:none;">
<div class="col-lg-2"></div>
<div class="col-lg-10">
<label class="text-pink"><input type="checkbox" name="gps_again" value="1" /> GPS-Koordinaten erneut berechnen</label>
</div>
</div>
<?php endif; ?>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="code">Objekt ID</label>
@@ -205,15 +207,6 @@
</div>
</div>
<!--
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="description">Bauabschnitt</label>
<div class="col-lg-10">
<textarea id="description" class="form-control" name="description" rows="5"><?=$building->description?></textarea>
</div>
</div>
-->
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="status_id">Status</label>
<div class="col-lg-10">
@@ -234,9 +227,9 @@
<div class="card-body">
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="pipeworker_id">Tiefbau *</label>
<label class="col-lg-2 col-form-label" for="pipeworker_id">Tiefbau</label>
<div class="col-lg-10">
<select class="select2 form-control " name="pipeworker_id" id="pipeworker_id" >
<select class="select2 form-control " name="pipeworker_id" id="pipeworker_id" <?=(!$me->is(["Admin", "netowner", "pipeplanner"])) ? "disabled='disabled'" : ""?>>
<option></option>
<?php foreach($pipeworkers as $pw): ?>
<option value="<?=$pw->id?>" <?=($building->pipeworker_id == $pw->id) ? "selected='selected'" : ""?>><?=$pw->getCompanyOrName()?></option>
@@ -246,9 +239,9 @@
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="lineworker_id">Kabelbau *</label>
<label class="col-lg-2 col-form-label" for="lineworker_id">Kabelbau</label>
<div class="col-lg-10">
<select class="select2 form-control " name="lineworker_id" id="lineworker_id" <?=(!$me->is("Admin")) ? "disabled='disabled'" : ""?>>
<select class="select2 form-control " name="lineworker_id" id="lineworker_id" <?=(!$me->is(["Admin", "netowner", "pipeplanner"])) ? "disabled='disabled'" : ""?>>
<option></option>
<?php foreach($lineworkers as $lw): ?>
<option value="<?=$lw->id?>" <?=($building->lineworker_id == $lw->id) ? "selected='selected'" : ""?>><?=$lw->getCompanyOrName()?></option>
Layout/default/User/Form.php
+1 -1
View File
@@ -46,7 +46,7 @@
<select name="address_id" id="address_id" class="form-control">
<option value=""></option>
<?php foreach($addresses as $address): ?>
<option value="<?=$address->id?>" <?=($address->id == $user->address_id) ? "selected='selected'" : ""?>><?=($address->company) ? $address->company : $address->getFullName()?></option>
<option value="<?=$address->id?>" <?=($address->id == $user->address_id || $address->id == $address_id) ? "selected='selected'" : ""?>><?=($address->company) ? $address->company : $address->getFullName()?></option>
<?php endforeach; ?>
</select>
</div>
Layout/default/User/Index.php
+4
View File
@@ -38,7 +38,11 @@
</p>
</div>
<div class="float-right">
<?php if(is_array($filter) && count($filter) && is_numeric($filter['address_id'])): ?>
<a class="btn btn-primary" href="<?=self::getUrl("User", "add", ['address_id' => $filter['address_id']])?>"><i class="fas fa-plus"></i> Neuen Benutzer anlegen</a>
<?php else: ?>
<a class="btn btn-primary" href="<?=self::getUrl("User", "add")?>"><i class="fas fa-plus"></i> Neuen Benutzer anlegen</a>
<?php endif; ?>
</div>
<table class="table table-striped table-hover">
<tr>
Layout/default/menu.php
+12 -9
View File
@@ -7,6 +7,8 @@
<li class="has-submenu">
<a href="<?=self::getUrl("Dashboard")?>"><i class="fe-airplay"></i>Dashboard</a>
</li>
<?php if($me->is("Admin")): ?>
<li class="has-submenu">
<a href="#">
<i class="fas fa-database"></i>Stammdaten <div class="arrow-down"></div>
@@ -16,38 +18,39 @@
<a href="<?=self::getUrl("Address")?>">Personen & Firmen</a>
<ul class="sub-submenu">
<li><a href="<?=self::getUrl("Address", "Index" , ["filter" => ["addresstype" => ["employee"]]])?>">Mitarbeiter</a></li>
<li><a href="<?=self::getUrl("Address", "Index" , ["filter" => ["addresstype" => ["customer"]]])?>">Kunden</a></li>
<li><a href="<?=self::getUrl("Address", "Index" , ["filter" => ["addresstype" => ["supplier"]]])?>">Lieferanten</a></li>
</ul>
</li>
<li class="has-sub-submenu">
<a href="<?=self::getUrl("Product")?>">Produkte</a>
<ul class="sub-submenu">
<li><a href="<?=self::getUrl("Producttech")?>">Technologien</a></li>
</ul>
</li>
<li><a href="<?=self::getUrl("Product")?>">Produkte</a></li>
<li><a href="<?=self::getUrl("Producttech")?>">Technologien</a></li>
<li><a href="<?=self::getUrl("User")?>">Benutzer</a></li>
<li><a href="<?=self::getUrl("Network")?>">Netzgebiete</a></li>
</ul>
</li>
<?php endif; ?>
<?php if($me->is(["Admin","netowner","lineplanner","pipeplanner"])): ?>
<li class="has-submenu">
<a href="#">
<i class="fas fa-hard-hat"></i>Netzbau <div class="arrow-down"></div>
</a>
<ul class="submenu">
<li><a href="<?=self::getUrl("Building")?>">Objekte</a></li>
<li><a href="<?=self::getUrl("Building")?>">Objekte & Anschlüsse</a></li>
</ul>
</li>
<?php endif; ?>
<?php if($me->is(["Admin","salespartner"])): ?>
<li class="has-submenu">
<a href="#">
<i class="fas fa-hard-hat"></i>Verkauf <div class="arrow-down"></div>
<i class="fas fa-beer"></i>Verkauf <div class="arrow-down"></div>
</a>
<ul class="submenu">
<li><a href="<?=self::getUrl("Order")?>">Bestellungen</a></li>
</ul>
</li>
<?php endif; ?>
</ul>
<!-- End navigation menu -->
Layout/default/topbar.php
+9 -45
View File
@@ -94,58 +94,22 @@
</div>
</li>
<li class="dropdown notification-list">
<a class="nav-link dropdown-toggle nav-user mr-0" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
<li>
<a class="nav-link nav-user mr-0" href="#">
<!-- <img src="<?=self::getResourcePath()?>assets/images/users/avatar-4.jpg" alt="user-image" class="rounded-circle"> -->
<i style="font-size: 24px; border-radius: 50%;" class="fas fa-user-secret text-white img-circle bg-info"></i>
<span class="pro-user-name ml-1">
<?=$me->username?> <i class="mdi mdi-chevron-down"></i>
<?=$me->username?>
</span>
</a>
<div class="dropdown-menu dropdown-menu-right profile-dropdown ">
<!-- item-->
<div class="dropdown-item noti-title">
<h6 class="m-0">
Welcome !
</h6>
</div>
<!-- item-->
<a href="javascript:void(0);" class="dropdown-item notify-item">
<i class="dripicons-user"></i>
<span>Mein Konto</span>
</a>
<!-- item-->
<a href="javascript:void(0);" class="dropdown-item notify-item">
<i class="dripicons-gear"></i>
<span>Einstellungen</span>
</a>
<!-- item-->
<a href="javascript:void(0);" class="dropdown-item notify-item">
<i class="dripicons-help"></i>
<span>Support</span>
</a>
<!-- item-->
<a href="javascript:void(0);" class="dropdown-item notify-item">
<i class="dripicons-lock"></i>
<span>Mochzua</span>
</a>
<div class="dropdown-divider"></div>
<!-- item-->
<a href="<?=self::getUrl("Dashboard","logout")?>" class="dropdown-item notify-item">
<i class="dripicons-power"></i>
<span>Omöldn</span>
</a>
</div>
</li>
<li>
<a href="<?=self::getUrl("Dashboard","logout")?>" class="nav-link nav-user">
<i class="fas fa-sign-out-alt"></i>
<span class="pro-user-name ml-1">Omöldn</span>
</a>
</li>
</ul>