From 478c0cf2e579b97310d1b6846cd26671f29afb94 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 24 Apr 2016 20:47:29 +0200 Subject: [PATCH] Unit test bug fixes --- Models/ProjectMapper.php | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Models/ProjectMapper.php b/Models/ProjectMapper.php index 9fc3bd7..c5488d4 100644 --- a/Models/ProjectMapper.php +++ b/Models/ProjectMapper.php @@ -15,6 +15,8 @@ */ namespace Modules\ProjectManagement\Models; +use Modules\Calendar\Models\CalendarMapper; +use Modules\Tasks\Models\TaskMapper; use phpOMS\DataStorage\Database\DataMapperAbstract; use phpOMS\DataStorage\Database\Query\Builder; use phpOMS\DataStorage\Database\Query\Column; @@ -58,8 +60,8 @@ class ProjectMapper extends DataMapperAbstract * @since 1.0.0 */ protected static $hasOne = [ - 'project' => [ - 'mapper' => \Modules\Calendar\Models\CalendarMapper::class, + 'calendar' => [ + 'mapper' => CalendarMapper::class, 'src' => 'projectmanagement_project_calendar', ], ]; @@ -71,13 +73,6 @@ class ProjectMapper extends DataMapperAbstract * @since 1.0.0 */ protected static $hasMany = [ - 'sources' => [ - 'mapper' => \Modules\Tasks\Models\TaskMapper::class, /* mapper of the related object */ - 'relationmapper' => null, /* if the relation itself is a more complex object that has it's own mapper */ - 'table' => 'projectmanager_task_relation', /* table of the related object, null if no relation table is used (many->1) */ - 'dst' => 'projectmanager_task_relation_dst', - 'src' => 'projectmanager_task_relation_src', - ], ]; /** @@ -88,6 +83,14 @@ class ProjectMapper extends DataMapperAbstract */ protected static $table = 'projectmanagement_project'; + /** + * Primary field name. + * + * @var string + * @since 1.0.0 + */ + protected static $primaryField = 'projectmanagement_project_id'; + /** * Create media. *