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

Admins don't see non-termination orders when filtering network_id

Browse Source
This commit is contained in:
Frank Schubert
2021-10-19 22:35:34 +02:00
parent 6d613b141d
commit 43f11a20f9
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Layout/default/Order/Index.php
View File

@@ -202,7 +202,7 @@
<div class="card">
<div class="card-body mb-3">
<div class="float-left">
<h4 class="header-title">Liste aller Bestellungen</h4>
<h4 class="header-title">Bestellungen mit Anschluss</h4>
</div>
<div class="float-right">
<a class="btn btn-primary mb-2" href="<?=self::getUrl("Order", "add")?>"><i class="fas fa-plus"></i> Neue Bestellung anlegen</a>

8
application/Order/OrderController.php
View File

@@ -104,7 +104,9 @@ class OrderController extends mfBaseController {
$order_search['product_id'] = null;
// orders without a product
if($this->me->isAdmin()) {
$lonelies = OrderModel::search($order_search);
if(!$this->request->filter['network_id']) {
$lonelies = OrderModel::search($order_search);
}
} else {
$order_search['create_by'] = $this->me->id;
$lonelies = OrderModel::search($order_search);
@@ -119,7 +121,9 @@ class OrderController extends mfBaseController {
$order_search['product_id'] = ">0";
$order_search['termination_id'] = null;
if($this->me->isAdmin()) {
$lonelies = OrderModel::search($order_search);
if(!$this->request->filter['network_id']) {
$lonelies = OrderModel::search($order_search);
}
} else {
$order_search['create_by'] = $this->me->id;
$lonelies = OrderModel::search($order_search);