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

Merge branch 'Workorder/improve-and-add-dashboard' into 'master'

Browse Source 
fixed permissions

See merge request fronk/thetool!2061
This commit is contained in:
Luca Haid
2026-01-28 09:31:18 +00:00
parent 088d61af72 5a6bf351b2
commit fd62342f0f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/WorkorderDashboard/WorkorderDashboardController.php
View File

@@ -36,10 +36,10 @@ class WorkorderDashboardController extends TTCrud
protected function getFilterOptionsAction() protected function getFilterOptionsAction()
{ {
if ($this->me->isAdmin()) { if ($this->user->isAdmin()) {
$tenants = WorkorderTenantConfigModel::getAll([], null, 0, ['key' => 'name', 'order' => 'ASC']); $tenants = WorkorderTenantConfigModel::getAll([], null, 0, ['key' => 'name', 'order' => 'ASC']);
} else { } else {
$tenants = WorkorderTenantConfigModel::getAll(['addressId' => $this->me->address_id], null, 0, ['key' => 'name', 'order' => 'ASC']); $tenants = WorkorderTenantConfigModel::getAll(['addressId' => $this->user->address_id], null, 0, ['key' => 'name', 'order' => 'ASC']);
} }
$companies = WorkorderCompanyModel::getAll([], null, 0, ['key' => 'name', 'order' => 'ASC']); $companies = WorkorderCompanyModel::getAll([], null, 0, ['key' => 'name', 'order' => 'ASC']);
@@ -58,7 +58,7 @@ class WorkorderDashboardController extends TTCrud
self::returnJson([]); self::returnJson([]);
return; return;
} }
if (!$this->me->isAdmin() && $config->addressId != $this->me->address_id) { if (!$this->user->isAdmin() && $config->addressId != $this->user->address_id) {
self::returnJson([]); self::returnJson([]);
return; return;
} }
@@ -87,7 +87,7 @@ class WorkorderDashboardController extends TTCrud
if (!$tenantId) self::sendError('Mandant muss ausgewählt werden.'); if (!$tenantId) self::sendError('Mandant muss ausgewählt werden.');
$config = WorkorderTenantConfigModel::get($tenantId); $config = WorkorderTenantConfigModel::get($tenantId);
if (!$config) self::sendError('Mandant nicht gefunden.'); if (!$config) self::sendError('Mandant nicht gefunden.');
if (!$this->me->isAdmin() && $config->addressId != $this->me->address_id) self::sendError('Keine Berechtigung für diesen Mandanten.'); if (!$this->user->isAdmin() && $config->addressId != $this->user->address_id) self::sendError('Keine Berechtigung für diesen Mandanten.');
$networks = NetworkModel::search(['owner_id' => $config->addressId]); $networks = NetworkModel::search(['owner_id' => $config->addressId]);
$tenantCampaignIds = array_map(fn($c) => $c->id, PreordercampaignModel::search(['network_id' => array_map(fn($n) => $n->id, $networks)])); $tenantCampaignIds = array_map(fn($c) => $c->id, PreordercampaignModel::search(['network_id' => array_map(fn($n) => $n->id, $networks)]));