From e3970e3e530b21dad4b7762fbca73e7afa4b1c51 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 7 Oct 2017 22:58:39 +0200
Subject: [PATCH] Fix #63

---
 Controller.php                        |  8 +++++---
 Models/AccountMapper.php              | 15 +++++++++++++++
 Models/NullAccountPermission.php      |  2 +-
 Theme/Backend/accounts-single.tpl.php | 21 +++++++++++----------
 Theme/Backend/groups-single.tpl.php   | 11 ++++++-----
 5 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/Controller.php b/Controller.php
index 989dcc9..24791b6 100644
--- a/Controller.php
+++ b/Controller.php
@@ -20,9 +20,11 @@ use phpOMS\Account\AccountStatus;
 use phpOMS\Account\AccountType;
 use Modules\Admin\Models\AccountMapper;
 use Modules\Admin\Models\AccountPermissionMapper;
+use Modules\Admin\Models\NullAccountPermission;
 use Modules\Admin\Models\Group;
 use Modules\Admin\Models\GroupMapper;
 use Modules\Admin\Models\GroupPermissionMapper;
+use Modules\Admin\Models\NullGroupPermission;
 use phpOMS\Account\GroupStatus;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
@@ -173,8 +175,8 @@ class Controller extends ModuleAbstract implements WebInterface
         $view->addData('account', AccountMapper::get((int) $request->getData('id')));
 
         $permissions = AccountPermissionMapper::getFor((int) $request->getData('id'), 'account');
-        
-        if(!isset($permissions)) {
+
+        if(!isset($permissions) || $permissions instanceof NullAccountPermission) {
             $permissions = [];
         } elseif(!is_array($permissions)) {
             $permissions = [$permissions];
@@ -245,7 +247,7 @@ class Controller extends ModuleAbstract implements WebInterface
 
         $permissions = GroupPermissionMapper::getFor((int) $request->getData('id'), 'group');
         
-        if(!isset($permissions)) {
+        if(!isset($permissions) || $permissions instanceof NullGroupPermission) {
             $permissions = [];
         } elseif(!is_array($permissions)) {
             $permissions = [$permissions];
diff --git a/Models/AccountMapper.php b/Models/AccountMapper.php
index 4c180d1..d7882ba 100644
--- a/Models/AccountMapper.php
+++ b/Models/AccountMapper.php
@@ -46,6 +46,21 @@ class AccountMapper extends DataMapperAbstract
         'account_created_at' => ['name' => 'account_created_at', 'type' => 'DateTime', 'internal' => 'createdAt'],
     ];
 
+    /**
+     * Has many relation.
+     *
+     * @var array
+     * @since 1.0.0
+     */
+    protected static $hasMany = [
+        'groups' => [ 
+            'mapper'         => GroupMapper::class,
+            'table'          => 'account_group',
+            'dst'            => 'account_group_account',
+            'src'            => 'account_group_group',
+        ],
+    ];
+
     /**
      * Primary table.
      *
diff --git a/Models/NullAccountPermission.php b/Models/NullAccountPermission.php
index 26eb268..0de9640 100644
--- a/Models/NullAccountPermission.php
+++ b/Models/NullAccountPermission.php
@@ -14,6 +14,6 @@
 declare(strict_types=1);
 namespace Modules\Admin\Models;
 
-class NullAccountPermission extends Group
+class NullAccountPermission extends AccountPermission
 {
 }
diff --git a/Theme/Backend/accounts-single.tpl.php b/Theme/Backend/accounts-single.tpl.php
index 7c2c623..3d6d264 100644
--- a/Theme/Backend/accounts-single.tpl.php
+++ b/Theme/Backend/accounts-single.tpl.php
@@ -67,12 +67,13 @@ echo $this->getData('nav')->render(); ?>
             <thead>
                 <tr>
                     <td><?= $this->getHtml('ID', 0, 0); ?>
-                    <td>Name
+                    <td class="wf-100"><?= $this->getHtml('Name') ?>
             <tbody>
-                <?php $c = 0; foreach ([] as $key => $value) : $c++; ?>
-                <tr>
-                    <td>
-                    <td>
+                <?php $c = 0; $groups = $account->getGroups(); foreach ($groups as $key => $value) : $c++; 
+                $url = \phpOMS\Uri\UriFactory::build('{/base}/{/lang}/backend/admin/group/settings?{?}&id=' . $value->getId()); ?>
+                <tr data-href="<?= $url; ?>">
+                    <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
                 <?php endforeach; ?>
                 <?php if($c === 0) : ?>
                 <tr><td colspan="2" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
@@ -118,11 +119,11 @@ echo $this->getData('nav')->render(); ?>
                     <td><?= $value->getElement(); ?>
                     <td><?= $value->getComponent(); ?>
                     <td>
-                        <?= \phpOMS\Account\PermissionType::CREATE | $permission === $permission ? 'C' : ''; ?>
-                        <?= \phpOMS\Account\PermissionType::READ | $permission === $permission ? 'R' : ''; ?>
-                        <?= \phpOMS\Account\PermissionType::MODIFY | $permission === $permission ? 'U' : ''; ?>
-                        <?= \phpOMS\Account\PermissionType::DELETE | $permission === $permission ? 'D' : ''; ?>
-                        <?= \phpOMS\Account\PermissionType::PERMISSION | $permission === $permission ? 'P' : ''; ?>
+                        <?= (\phpOMS\Account\PermissionType::CREATE | $permission) === $permission ? 'C' : ''; ?>
+                        <?= (\phpOMS\Account\PermissionType::READ | $permission) === $permission ? 'R' : ''; ?>
+                        <?= (\phpOMS\Account\PermissionType::MODIFY | $permission) === $permission ? 'U' : ''; ?>
+                        <?= (\phpOMS\Account\PermissionType::DELETE | $permission) === $permission ? 'D' : ''; ?>
+                        <?= (\phpOMS\Account\PermissionType::PERMISSION | $permission) === $permission ? 'P' : ''; ?>
                 <?php endforeach; ?>
                 <?php if($c === 0) : ?>
                 <tr><td colspan="8" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
diff --git a/Theme/Backend/groups-single.tpl.php b/Theme/Backend/groups-single.tpl.php
index 49ca03f..ee58240 100644
--- a/Theme/Backend/groups-single.tpl.php
+++ b/Theme/Backend/groups-single.tpl.php
@@ -17,6 +17,7 @@
 
 $group = $this->getData('group');
 $permissions = $this->getData('permissions');
+$accounts = $this->getData('accounts');
 
 echo $this->getData('nav')->render(); ?>
 
@@ -104,11 +105,11 @@ echo $this->getData('nav')->render(); ?>
                     <td><?= $value->getElement(); ?>
                     <td><?= $value->getComponent(); ?>
                     <td>
-                        <?= \phpOMS\Account\PermissionType::CREATE | $permission === $permission ? 'C' : ''; ?>
-                        <?= \phpOMS\Account\PermissionType::READ | $permission === $permission ? 'R' : ''; ?>
-                        <?= \phpOMS\Account\PermissionType::MODIFY | $permission === $permission ? 'U' : ''; ?>
-                        <?= \phpOMS\Account\PermissionType::DELETE | $permission === $permission ? 'D' : ''; ?>
-                        <?= \phpOMS\Account\PermissionType::PERMISSION | $permission === $permission ? 'P' : ''; ?>
+                        <?= (\phpOMS\Account\PermissionType::CREATE | $permission) === $permission ? 'C' : ''; ?>
+                        <?= (\phpOMS\Account\PermissionType::READ | $permission) === $permission ? 'R' : ''; ?>
+                        <?= (\phpOMS\Account\PermissionType::MODIFY | $permission) === $permission ? 'U' : ''; ?>
+                        <?= (\phpOMS\Account\PermissionType::DELETE | $permission) === $permission ? 'D' : ''; ?>
+                        <?= (\phpOMS\Account\PermissionType::PERMISSION | $permission) === $permission ? 'P' : ''; ?>
                 <?php endforeach; ?>
                 <?php if($c === 0) : ?>
                 <tr><td colspan="8" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>