From f22ce373b06f77b32741c0ae781fe4f5ec5c4fca Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sun, 19 Apr 2020 18:41:01 +0200
Subject: [PATCH] show media files of user

---
 Controller/ApiController.php         |  3 ++-
 Controller/BackendController.php     | 23 +++++++----------------
 Theme/Backend/profile-single.tpl.php | 10 +++++-----
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 6889b02..62bcdfd 100644
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -148,7 +148,8 @@ final class ApiController extends Controller
             $request->getData('name') ?? '',
             $uploadedFiles,
             $request->getHeader()->getAccount(),
-            __DIR__ . '/../../../Modules/Media/Files/Accounts/' . $request->getHeader()->getAccount()
+            __DIR__ . '/../../../Modules/Media/Files',
+            '/Accounts/' . $request->getHeader()->getAccount()
         );
 
         $profile->setImage(\reset($uploaded));
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 350c8ea..8485794 100644
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -14,6 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Profile\Controller;
 
+use Modules\Media\Models\MediaMapper;
 use Modules\Profile\Models\ProfileMapper;
 
 use phpOMS\Asset\AssetType;
@@ -117,26 +118,16 @@ final class BackendController extends Controller
         $calendarView->setTemplate('/Modules/Calendar/Theme/Backend/Components/Calendar/mini');
         $view->addData('calendar', $calendarView);
 
-        if ($request->getData('for') !== null) {
-            $view->setData('account', ProfileMapper::getFor((int) $request->getData('for'), 'account'));
-        } else {
-            $view->setData('account', ProfileMapper::get((int) $request->getData('id')));
-        }
+        $profile = $request->getData('for') !== null
+            ? ProfileMapper::getFor((int) $request->getData('for'), 'account')
+            : ProfileMapper::get((int) $request->getData('id'));
+
+        $view->setData('account', $profile);
 
         $accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response);
         $view->addData('accGrpSelector', $accGrpSelector);
 
-        $settings = $this->app->appSettings->get([
-            1000000001, 1000000002, 1000000003, 1000000004, 1000000005, 1000000006, 1000000007, 1000000008, 1000000009,
-            1000000010, 1000000011, 1000000012, 1000000013, 1000000014, 1000000015, 1000000016, 1000000017, 1000000018, 1000000019,
-            1000000020, 1000000021, 1000000022, 1000000023, 1000000024, 1000000025, 1000000026, 1000000027, 1000000028, 1000000029,
-            1000001001, 1000001002, 1000001003, 1000001004, 1000001005,
-            1000002001, 1000002002, 1000002003, 1000002004, 1000002005, 1000002006,
-            1000003001, 1000003002, 1000003003, 1000003004, 1000003005, 1000003006,
-            1000004001, 1000004002, 1000004003, 1000004004, 1000004005,
-            1000005001, 1000005002, 1000005003, 1000005004, 1000005005, 1000005006, 1000005007, 1000005008,
-        ]);
-        $view->setData('settings', $settings);
+        $view->setData('media', MediaMapper::getFor((int) $profile->getAccount()->getId(), 'createdBy'));
 
         return $view;
     }
diff --git a/Theme/Backend/profile-single.tpl.php b/Theme/Backend/profile-single.tpl.php
index 30605b2..1361b44 100644
--- a/Theme/Backend/profile-single.tpl.php
+++ b/Theme/Backend/profile-single.tpl.php
@@ -19,8 +19,8 @@ use phpOMS\Uri\UriFactory;
  * @var \phpOMS\Views\View              $this
  * @var \Modules\Profile\Models\Profile $profile
  */
-$profile  = $this->getData('account');
-$settings = $this->getData('settings') ?? [];
+$profile = $this->getData('account');
+$media   = $this->getDatA('media') ?? [];
 
 $countryCodes    = \phpOMS\Localization\ISO3166TwoEnum::getConstants();
 $countries       = \phpOMS\Localization\ISO3166NameEnum::getConstants();
@@ -78,7 +78,7 @@ echo $this->getData('nav')->render();
                                 width="100px"></div>
                                 <?php if ($this->request->getHeader()->getAccount() === $account->getId()) : ?>
                                     <div><a id="iProfileUploadButton" href="#upload" data-action='[{"listener": "click", "key": 1, "action": [{"key": 1, "type": "event.prevent"}, {"key": 2, "type": "dom.click", "selector": "#iProfileUpload"}]}]'>Change</a>
-                                    <form id="iProfileUploadForm" action="<?= UriFactory::build('{/api}profile/settings/image'); ?>" method="post"><input data-action='[{"listener": "change", "key": 1, "action": [{"key": 1, "type": "form.submit", "selector": "#iProfileUploadForm"}]}]' id="iProfileUpload" name="profileImage" type="file" style="display: none;"></form></div>
+                                    <form id="iProfileUploadForm" action="<?= UriFactory::build('{/api}profile/settings/image'); ?>" method="post"><input data-action='[{"listener": "change", "key": 1, "action": [{"key": 1, "type": "form.submit", "selector": "#iProfileUploadForm"}]}]' id="iProfileUpload" name="profileImage" type="file" accept="image/png,image/gif,image/jpeg" style="display: none;"></form></div>
                                 <?php endif; ?>
                             </span>
                             <table class="list" style="table-layout: fixed">
@@ -147,8 +147,8 @@ echo $this->getData('nav')->render();
                     </div>
                 </div>
 
-                <div class="col-xs-12 col-md-6">
-                    <?= $this->getData('medialist')->render([]); ?>
+                <div class="col-xs-12">
+                    <?= $this->getData('medialist')->render($media); ?>
                 </div>
             </div>