From b293740b461823133230ff149d6a92433c5f142e Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 19 Dec 2021 20:20:38 +0100 Subject: [PATCH] bug fixes / dbmapper fixes --- Controller/ApiController.php | 14 -------------- Models/CostCenterL11nMapper.php | 10 +++++----- Models/CostCenterMapper.php | 9 +++++---- Models/CostObjectL11nMapper.php | 10 +++++----- Models/CostObjectMapper.php | 14 +++++++------- 5 files changed, 22 insertions(+), 35 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 83a4bc8..c0d6743 100644 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -67,7 +67,6 @@ final class ApiController extends Controller { $val = []; if (($val['name'] = empty($request->getData('name'))) - || ($val['status'] = false) ) { return $val; } @@ -125,7 +124,6 @@ final class ApiController extends Controller { $val = []; if (($val['id'] = empty($request->getData('id'))) - || ($val['status'] = false) ) { return $val; } @@ -183,7 +181,6 @@ final class ApiController extends Controller { $val = []; if (($val['name'] = empty($request->getData('name'))) - || ($val['status'] = false) ) { return $val; } @@ -241,7 +238,6 @@ final class ApiController extends Controller { $val = []; if (($val['id'] = empty($request->getData('id'))) - || ($val['status'] = false) ) { return $val; } @@ -299,7 +295,6 @@ final class ApiController extends Controller { $val = []; if (($val['name'] = empty($request->getData('name'))) - || ($val['status'] = false) ) { return $val; } @@ -357,7 +352,6 @@ final class ApiController extends Controller { $val = []; if (($val['id'] = empty($request->getData('id'))) - || ($val['status'] = false) ) { return $val; } @@ -415,7 +409,6 @@ final class ApiController extends Controller { $val = []; if (($val['name'] = empty($request->getData('name'))) - || ($val['status'] = false) ) { return $val; } @@ -473,7 +466,6 @@ final class ApiController extends Controller { $val = []; if (($val['id'] = empty($request->getData('id'))) - || ($val['status'] = false) ) { return $val; } @@ -531,7 +523,6 @@ final class ApiController extends Controller { $val = []; if (($val['name'] = empty($request->getData('name'))) - || ($val['status'] = false) ) { return $val; } @@ -589,7 +580,6 @@ final class ApiController extends Controller { $val = []; if (($val['id'] = empty($request->getData('id'))) - || ($val['status'] = false) ) { return $val; } @@ -647,7 +637,6 @@ final class ApiController extends Controller { $val = []; if (($val['name'] = empty($request->getData('name'))) - || ($val['status'] = false) ) { return $val; } @@ -705,7 +694,6 @@ final class ApiController extends Controller { $val = []; if (($val['id'] = empty($request->getData('id'))) - || ($val['status'] = false) ) { return $val; } @@ -763,7 +751,6 @@ final class ApiController extends Controller { $val = []; if (($val['name'] = empty($request->getData('name'))) - || ($val['status'] = false) ) { return $val; } @@ -821,7 +808,6 @@ final class ApiController extends Controller { $val = []; if (($val['id'] = empty($request->getData('id'))) - || ($val['status'] = false) ) { return $val; } diff --git a/Models/CostCenterL11nMapper.php b/Models/CostCenterL11nMapper.php index 7c7bb40..d38d034 100644 --- a/Models/CostCenterL11nMapper.php +++ b/Models/CostCenterL11nMapper.php @@ -33,11 +33,11 @@ final class CostCenterL11nMapper extends DataMapperFactory * @since 1.0.0 */ public const COLUMNS = [ - 'accounting_costcenter_l11n_id' => ['name' => 'accounting_costcenter_l11n_id', 'type' => 'int', 'internal' => 'id'], - 'accounting_costcenter_l11n_name' => ['name' => 'accounting_costcenter_l11n_name', 'type' => 'string', 'internal' => 'name', 'autocomplete' => true], - 'accounting_costcenter_l11n_description' => ['name' => 'accounting_costcenter_l11n_description', 'type' => 'string', 'internal' => 'description', 'autocomplete' => true], - 'accounting_costcenter_l11n_costcenter' => ['name' => 'accounting_costcenter_l11n_costcenter', 'type' => 'int', 'internal' => 'costcenter'], - 'accounting_costcenter_l11n_language' => ['name' => 'accounting_costcenter_l11n_language', 'type' => 'string', 'internal' => 'language'], + 'accounting_costcenter_l11n_id' => ['name' => 'accounting_costcenter_l11n_id', 'type' => 'int', 'internal' => 'id'], + 'accounting_costcenter_l11n_name' => ['name' => 'accounting_costcenter_l11n_name', 'type' => 'string', 'internal' => 'name', 'autocomplete' => true], + 'accounting_costcenter_l11n_description' => ['name' => 'accounting_costcenter_l11n_description', 'type' => 'string', 'internal' => 'description', 'autocomplete' => true], + 'accounting_costcenter_l11n_costcenter' => ['name' => 'accounting_costcenter_l11n_costcenter', 'type' => 'int', 'internal' => 'costcenter'], + 'accounting_costcenter_l11n_language' => ['name' => 'accounting_costcenter_l11n_language', 'type' => 'string', 'internal' => 'language'], ]; /** diff --git a/Models/CostCenterMapper.php b/Models/CostCenterMapper.php index c4fdb0c..da9ff06 100755 --- a/Models/CostCenterMapper.php +++ b/Models/CostCenterMapper.php @@ -45,10 +45,11 @@ final class CostCenterMapper extends DataMapperFactory */ public const HAS_MANY = [ 'l11n' => [ - 'mapper' => CostCenterL11nMapper::class, - 'table' => 'accounting_costcenter_l11n', - 'self' => 'accounting_costcenter_l11n_costcenter', - 'external' => null, + 'mapper' => CostCenterL11nMapper::class, + 'table' => 'accounting_costcenter_l11n', + 'self' => 'accounting_costcenter_l11n_costcenter', + 'conditional' => true, + 'external' => null, ], ]; diff --git a/Models/CostObjectL11nMapper.php b/Models/CostObjectL11nMapper.php index b5bbddd..c3694c3 100644 --- a/Models/CostObjectL11nMapper.php +++ b/Models/CostObjectL11nMapper.php @@ -33,11 +33,11 @@ final class CostObjectL11nMapper extends DataMapperFactory * @since 1.0.0 */ public const COLUMNS = [ - 'accounting_costobject_l11n_id' => ['name' => 'accounting_costobject_l11n_id', 'type' => 'int', 'internal' => 'id'], - 'accounting_costobject_l11n_name' => ['name' => 'accounting_costobject_l11n_name', 'type' => 'string', 'internal' => 'name', 'autocomplete' => true], - 'accounting_costobject_l11n_description' => ['name' => 'accounting_costobject_l11n_description', 'type' => 'string', 'internal' => 'description', 'autocomplete' => true], - 'accounting_costobject_l11n_costobject' => ['name' => 'accounting_costobject_l11n_costobject', 'type' => 'int', 'internal' => 'costobject'], - 'accounting_costobject_l11n_language' => ['name' => 'accounting_costobject_l11n_language', 'type' => 'string', 'internal' => 'language'], + 'accounting_costobject_l11n_id' => ['name' => 'accounting_costobject_l11n_id', 'type' => 'int', 'internal' => 'id'], + 'accounting_costobject_l11n_name' => ['name' => 'accounting_costobject_l11n_name', 'type' => 'string', 'internal' => 'name', 'autocomplete' => true], + 'accounting_costobject_l11n_description' => ['name' => 'accounting_costobject_l11n_description', 'type' => 'string', 'internal' => 'description', 'autocomplete' => true], + 'accounting_costobject_l11n_costobject' => ['name' => 'accounting_costobject_l11n_costobject', 'type' => 'int', 'internal' => 'costobject'], + 'accounting_costobject_l11n_language' => ['name' => 'accounting_costobject_l11n_language', 'type' => 'string', 'internal' => 'language'], ]; /** diff --git a/Models/CostObjectMapper.php b/Models/CostObjectMapper.php index 1aa5c5c..a635e10 100755 --- a/Models/CostObjectMapper.php +++ b/Models/CostObjectMapper.php @@ -33,8 +33,8 @@ final class CostObjectMapper extends DataMapperFactory * @since 1.0.0 */ public const COLUMNS = [ - 'accounting_costobject_id' => ['name' => 'accounting_costobject_id', 'type' => 'int', 'internal' => 'id'], - 'accounting_costobject_code' => ['name' => 'accounting_costobject_code', 'type' => 'string', 'internal' => 'code'], + 'accounting_costobject_id' => ['name' => 'accounting_costobject_id', 'type' => 'int', 'internal' => 'id'], + 'accounting_costobject_code' => ['name' => 'accounting_costobject_code', 'type' => 'string', 'internal' => 'code'], ]; /** @@ -45,11 +45,11 @@ final class CostObjectMapper extends DataMapperFactory */ public const HAS_MANY = [ 'l11n' => [ - 'mapper' => CostObjectL11nMapper::class, - 'table' => 'accounting_costobject_l11n', - 'self' => 'accounting_costobject_l11n_costobject', - 'conditional' => true, - 'external' => null, + 'mapper' => CostObjectL11nMapper::class, + 'table' => 'accounting_costobject_l11n', + 'self' => 'accounting_costobject_l11n_costobject', + 'conditional' => true, + 'external' => null, ], ];