From 81337ee7ef25a41925fc78de323420af1c795719 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 21 Oct 2020 22:50:34 +0200 Subject: [PATCH] correct datamapper self/external usage (invert) --- Models/CauseMapper.php | 6 +++--- Models/DepartmentMapper.php | 2 +- Models/ProcessMapper.php | 4 ++-- Models/ProjectMapper.php | 2 +- Models/RiskMapper.php | 26 +++++++++++++------------- Models/SolutionMapper.php | 4 ++-- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Models/CauseMapper.php b/Models/CauseMapper.php index 9ac4a1f..732a7dd 100755 --- a/Models/CauseMapper.php +++ b/Models/CauseMapper.php @@ -52,15 +52,15 @@ final class CauseMapper extends DataMapperAbstract protected static array $belongsTo = [ 'risk' => [ 'mapper' => RiskMapper::class, - 'self' => 'riskmngmt_cause_risk', + 'external' => 'riskmngmt_cause_risk', ], 'category' => [ 'mapper' => CategoryMapper::class, - 'self' => 'riskmngmt_cause_category', + 'external' => 'riskmngmt_cause_category', ], 'department' => [ 'mapper' => DepartmentMapper::class, - 'self' => 'riskmngmt_cause_department', + 'external' => 'riskmngmt_cause_department', ], ]; diff --git a/Models/DepartmentMapper.php b/Models/DepartmentMapper.php index 0900b25..10c981f 100755 --- a/Models/DepartmentMapper.php +++ b/Models/DepartmentMapper.php @@ -64,7 +64,7 @@ final class DepartmentMapper extends DataMapperAbstract protected static array $belongsTo = [ 'department' => [ 'mapper' => \Modules\Organization\Models\DepartmentMapper::class, - 'self' => 'riskmngmt_department_department', + 'external' => 'riskmngmt_department_department', ], ]; } diff --git a/Models/ProcessMapper.php b/Models/ProcessMapper.php index 6d4c89a..da08820 100755 --- a/Models/ProcessMapper.php +++ b/Models/ProcessMapper.php @@ -53,11 +53,11 @@ final class ProcessMapper extends DataMapperAbstract protected static array $belongsTo = [ 'unit' => [ 'mapper' => UnitMapper::class, - 'self' => 'riskmngmt_process_unit', + 'external' => 'riskmngmt_process_unit', ], 'department' => [ 'mapper' => DepartmentMapper::class, - 'self' => 'riskmngmt_process_department', + 'external' => 'riskmngmt_process_department', ], ]; diff --git a/Models/ProjectMapper.php b/Models/ProjectMapper.php index 39b0357..04b5e90 100755 --- a/Models/ProjectMapper.php +++ b/Models/ProjectMapper.php @@ -64,7 +64,7 @@ final class ProjectMapper extends DataMapperAbstract protected static array $belongsTo = [ 'project' => [ 'mapper' => \Modules\ProjectManagement\Models\ProjectMapper::class, - 'self' => 'riskmngmt_project_project', + 'external' => 'riskmngmt_project_project', ], ]; } diff --git a/Models/RiskMapper.php b/Models/RiskMapper.php index bf3ebcc..85d71df 100755 --- a/Models/RiskMapper.php +++ b/Models/RiskMapper.php @@ -59,26 +59,26 @@ final class RiskMapper extends DataMapperAbstract 'media' => [ 'mapper' => MediaMapper::class, 'table' => 'riskmngmt_risk_media', - 'external' => 'riskmngmt_risk_media_risk', - 'self' => 'riskmngmt_risk_media_media', + 'external' => 'riskmngmt_risk_media_media', + 'self' => 'riskmngmt_risk_media_risk', ], 'riskObjects' => [ 'mapper' => RiskObjectMapper::class, 'table' => 'riskmngmt_risk_object', - 'external' => 'riskmngmt_risk_object_risk', - 'self' => null, + 'self' => 'riskmngmt_risk_object_risk', + 'external' => null, ], 'causes' => [ 'mapper' => CauseMapper::class, 'table' => 'riskmngmt_cause', - 'external' => 'riskmngmt_cause_risk', - 'self' => null, + 'self' => 'riskmngmt_cause_risk', + 'external' => null, ], 'solutions' => [ 'mapper' => SolutionMapper::class, 'table' => 'riskmngmt_solution', - 'external' => 'riskmngmt_solution_risk', - 'self' => null, + 'self' => 'riskmngmt_solution_risk', + 'external' => null, ], ]; @@ -91,23 +91,23 @@ final class RiskMapper extends DataMapperAbstract protected static array $belongsTo = [ 'project' => [ 'mapper' => ProjectMapper::class, - 'self' => 'riskmngmt_risk_project', + 'external' => 'riskmngmt_risk_project', ], 'process' => [ 'mapper' => ProcessMapper::class, - 'self' => 'riskmngmt_risk_process', + 'external' => 'riskmngmt_risk_process', ], 'category' => [ 'mapper' => CategoryMapper::class, - 'self' => 'riskmngmt_risk_category', + 'external' => 'riskmngmt_risk_category', ], 'department' => [ 'mapper' => DepartmentMapper::class, - 'self' => 'riskmngmt_risk_department', + 'external' => 'riskmngmt_risk_department', ], 'unit' => [ 'mapper' => UnitMapper::class, - 'self' => 'riskmngmt_risk_unit', + 'external' => 'riskmngmt_risk_unit', ], ]; diff --git a/Models/SolutionMapper.php b/Models/SolutionMapper.php index 27e2b99..040b515 100755 --- a/Models/SolutionMapper.php +++ b/Models/SolutionMapper.php @@ -51,11 +51,11 @@ final class SolutionMapper extends DataMapperAbstract protected static array $belongsTo = [ 'risk' => [ 'mapper' => RiskMapper::class, - 'self' => 'riskmngmt_solution_risk', + 'external' => 'riskmngmt_solution_risk', ], 'cause' => [ 'mapper' => CauseMapper::class, - 'self' => 'riskmngmt_solution_cause', + 'external' => 'riskmngmt_solution_cause', ], ];