From a05bfbcbadee1486400477ed0224d649f85eabae Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 12 Oct 2023 22:49:20 +0000 Subject: [PATCH] todos fixed --- Controller/ApiAttributeController.php | 6 +++--- Theme/Backend/Lang/Navigation.de.lang.php | 4 ++-- Theme/Backend/Lang/de.lang.php | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Controller/ApiAttributeController.php b/Controller/ApiAttributeController.php index 865fef1..a0722e2 100644 --- a/Controller/ApiAttributeController.php +++ b/Controller/ApiAttributeController.php @@ -61,7 +61,7 @@ final class ApiAttributeController extends Controller return; } - $type = ContractAttributeTypeMapper::get()->where('id', (int) $request->getData('type'))->execute(); + $type = ContractAttributeTypeMapper::get()->with('defaults')->where('id', (int) $request->getData('type'))->execute(); $attribute = $this->createAttributeFromRequest($request, $type); $this->createModel($request->header->account, $attribute, ContractAttributeMapper::class, 'attribute', $request->getOrigin()); $this->createStandardCreateResponse($request, $response, $attribute); @@ -359,7 +359,7 @@ final class ApiAttributeController extends Controller } /** @var AttributeType $old */ - $old = ContractAttributeTypeMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $old = ContractAttributeTypeMapper::get()->with('defaults')->where('id', (int) $request->getData('id'))->execute(); $new = $this->updateAttributeTypeFromRequest($request, clone $old); $this->updateModel($request->header->account, $old, $new, ContractAttributeTypeMapper::class, 'contract_attribute_type', $request->getOrigin()); @@ -391,7 +391,7 @@ final class ApiAttributeController extends Controller } /** @var AttributeType $contractAttributeType */ - $contractAttributeType = ContractAttributeTypeMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $contractAttributeType = ContractAttributeTypeMapper::get()->with('defaults')->where('id', (int) $request->getData('id'))->execute(); $this->deleteModel($request->header->account, $contractAttributeType, ContractAttributeTypeMapper::class, 'contract_attribute_type', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $contractAttributeType); } diff --git a/Theme/Backend/Lang/Navigation.de.lang.php b/Theme/Backend/Lang/Navigation.de.lang.php index f586780..7c87f9f 100755 --- a/Theme/Backend/Lang/Navigation.de.lang.php +++ b/Theme/Backend/Lang/Navigation.de.lang.php @@ -14,8 +14,8 @@ declare(strict_types=1); return ['Navigation' => [ 'Contract' => 'Vertrag', - 'ContractTypes' => '', + 'ContractTypes' => 'Vertragsarten', 'Contracts' => 'Verträge', 'Create' => 'Erstellen', - 'List' => 'Aufführen', + 'List' => 'Liste', ]]; diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index 2432428..359720a 100755 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -22,7 +22,7 @@ return ['ContractManagement' => [ 'Description' => 'Beschreibung', 'End' => 'Ende', 'Files' => 'Dateien', - 'Name' => '', + 'Name' => 'Name', 'Overview' => 'Übersicht', 'Parties' => 'Parteien', 'Start' => 'Start',