diff --git a/application/WorkorderAdmin/WorkorderAdminController.php b/application/WorkorderAdmin/WorkorderAdminController.php index ef7497834..ffdbf2073 100644 --- a/application/WorkorderAdmin/WorkorderAdminController.php +++ b/application/WorkorderAdmin/WorkorderAdminController.php @@ -273,7 +273,7 @@ class WorkorderAdminController extends WorkorderBaseController $filters = json_decode($config->workorderCreationFilters, true); if (empty($filters)) continue; - $networks = NetworkModel::getAll(['owner_id' => $config->addressId]); + $networks = NetworkModel::search(['owner_id' => $config->addressId]); if (empty($networks)) continue; $tenantCampaigns = array_map(fn($n) => $n->id, PreordercampaignModel::getAll(['network_id' => array_map(fn($n) => $n->id, $networks)])); diff --git a/application/WorkorderBase/WorkorderBaseController.php b/application/WorkorderBase/WorkorderBaseController.php index 12c6c35cb..300007e08 100644 --- a/application/WorkorderBase/WorkorderBaseController.php +++ b/application/WorkorderBase/WorkorderBaseController.php @@ -46,8 +46,8 @@ class WorkorderBaseController extends TTCrud { if (empty($this->request->workorderId)) self::sendError("Arbeitsauftrags-ID fehlt."); - $docs = WorkorderDocumentationModel::getAll(['workorderId' => $this->request->workorderId], null, 0, ['key' => 'create', 'order' => 'ASC']); - $journals = WorkorderJournalModel::getAll(['workorderId' => $this->request->workorderId], null, 0, ['key' => 'create', 'order' => 'DESC']); + $docs = WorkorderDocumentationModel::getAll(['workorderId' => intval($this->request->workorderId)], null, 0, ['key' => 'create', 'order' => 'ASC']); + $journals = WorkorderJournalModel::getAll(['workorderId' => intval($this->request->workorderId)], null, 0, ['key' => 'create', 'order' => 'DESC']); $tenantConfig = $this->getTenantConfigFromWorkorder((int)$this->request->workorderId); if ($tenantConfig && !empty($tenantConfig->documentationTypes)) { @@ -93,7 +93,7 @@ class WorkorderBaseController extends TTCrud WorkorderJournalModel::create(['workorderId' => $post['workorderId'], 'text' => $post['text'], 'createBy' => $this->user->id, 'create' => time()]); - $journals = WorkorderJournalModel::getAll(['workorderId' => $post['workorderId']], null, 0, ['key' => 'create', 'order' => 'DESC']); + $journals = WorkorderJournalModel::getAll(['workorderId' => intval($post['workorderId'])], null, 0, ['key' => 'create', 'order' => 'DESC']); foreach ($journals as $journal) { $journal->createByName = UserModel::getOne($journal->createBy)->name ?? 'Unbekannt'; }