Merge branch 'Workorder/improve-and-add-dashboard' into 'master'
fixed permissions See merge request fronk/thetool!2061
This commit is contained in:
@@ -36,10 +36,10 @@ class WorkorderDashboardController extends TTCrud
|
||||
|
||||
protected function getFilterOptionsAction()
|
||||
{
|
||||
if ($this->me->isAdmin()) {
|
||||
if ($this->user->isAdmin()) {
|
||||
$tenants = WorkorderTenantConfigModel::getAll([], null, 0, ['key' => 'name', 'order' => 'ASC']);
|
||||
} 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']);
|
||||
|
||||
@@ -58,7 +58,7 @@ class WorkorderDashboardController extends TTCrud
|
||||
self::returnJson([]);
|
||||
return;
|
||||
}
|
||||
if (!$this->me->isAdmin() && $config->addressId != $this->me->address_id) {
|
||||
if (!$this->user->isAdmin() && $config->addressId != $this->user->address_id) {
|
||||
self::returnJson([]);
|
||||
return;
|
||||
}
|
||||
@@ -87,7 +87,7 @@ class WorkorderDashboardController extends TTCrud
|
||||
if (!$tenantId) self::sendError('Mandant muss ausgewählt werden.');
|
||||
$config = WorkorderTenantConfigModel::get($tenantId);
|
||||
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]);
|
||||
$tenantCampaignIds = array_map(fn($c) => $c->id, PreordercampaignModel::search(['network_id' => array_map(fn($n) => $n->id, $networks)]));
|
||||
|
||||
Reference in New Issue
Block a user