From 1867c1b77ee6fc104a91f6be02e502acffa8c82d Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Thu, 27 Jul 2017 20:37:47 +0200
Subject: [PATCH] Fix media createdBy output

---
 Models/Media.php                 | 4 ++--
 Models/MediaMapper.php           | 8 ++++++++
 Theme/Backend/media-list.tpl.php | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Models/Media.php b/Models/Media.php
index 7c1806e..db67a6c 100644
--- a/Models/Media.php
+++ b/Models/Media.php
@@ -136,11 +136,11 @@ class Media
     }
 
     /**
-     * @return int
+     * @return mixed
      *
      * @since  1.0.0
      */
-    public function getCreatedBy() : int
+    public function getCreatedBy()
     {
         return $this->createdBy;
     }
diff --git a/Models/MediaMapper.php b/Models/MediaMapper.php
index af0c535..4101466 100644
--- a/Models/MediaMapper.php
+++ b/Models/MediaMapper.php
@@ -18,6 +18,7 @@ use phpOMS\DataStorage\Database\DataMapperAbstract;
 use phpOMS\DataStorage\Database\Query\Builder;
 use phpOMS\DataStorage\Database\Query\Column;
 use phpOMS\DataStorage\Database\RelationType;
+use Modules\Admin\Models\AccountMapper;
 
 class MediaMapper extends DataMapperAbstract
 {
@@ -42,6 +43,13 @@ class MediaMapper extends DataMapperAbstract
         'media_created_at'  => ['name' => 'media_created_at', 'type' => 'DateTime', 'internal' => 'createdAt'],
     ];
 
+    protected static $belongsTo = [
+        'createdBy' => [
+            'mapper'         => AccountMapper::class,
+            'dest'            => 'media_created_by',
+        ],
+    ];
+
     /**
      * Primary table.
      *
diff --git a/Theme/Backend/media-list.tpl.php b/Theme/Backend/media-list.tpl.php
index ed7e987..1781661 100644
--- a/Theme/Backend/media-list.tpl.php
+++ b/Theme/Backend/media-list.tpl.php
@@ -75,7 +75,7 @@ echo $this->getData('nav')->render(); ?>
                             <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getName(), ENT_COMPAT, 'utf-8'); ?></a>
                             <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getExtension(), ENT_COMPAT, 'utf-8'); ?></a>
                             <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getSize(), ENT_COMPAT, 'utf-8'); ?></a>
-                            <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getCreatedBy(), ENT_COMPAT, 'utf-8'); ?></a>
+                            <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getCreatedBy()->getName1(), ENT_COMPAT, 'utf-8'); ?></a>
                             <td><a href="<?= $url; ?>"><?= htmlspecialchars($value->getCreatedAt()->format('Y-m-d H:i:s'), ENT_COMPAT, 'utf-8'); ?></a>
                         <?php endforeach; ?>
                         <?php if($count === 0) : ?>