From 52305da056e5153916a5540fd8e7a529ad864382 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 25 May 2019 11:16:44 +0200
Subject: [PATCH] Fix bugs during demo app set up

---
 Models/AccountMapper.php               | 18 ++++++++++++++++--
 Models/Group.php                       |  5 ++++-
 Theme/Backend/settings-general.tpl.php |  7 ++++++-
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/Models/AccountMapper.php b/Models/AccountMapper.php
index ae88ba9..522d4f9 100644
--- a/Models/AccountMapper.php
+++ b/Models/AccountMapper.php
@@ -107,10 +107,24 @@ final class AccountMapper extends DataMapperAbstract
     {
         $account          = self::get($id);
         $groupPermissions = GroupPermissionMapper::getFor(\array_keys($account->getGroups()), 'group', RelationType::ALL, null, 2);
-        $account->addPermissions(\is_array($groupPermissions) ? $groupPermissions : [$groupPermissions]);
+
+        if (\is_array($groupPermissions)) {
+            foreach ($groupPermissions as $permission) {
+                $account->addPermissions(\is_array($permission) ? $permission : [$permission]);
+            }
+        } else {
+            $account->addPermissions([$groupPermissions]);
+        }
 
         $accountPermissions = AccountPermissionMapper::getFor($id, 'account', RelationType::ALL, null, 2);
-        $account->addPermissions(\is_array($accountPermissions) ? $accountPermissions : [$accountPermissions]);
+
+        if (\is_array($accountPermissions)) {
+            foreach ($accountPermissions as $permission) {
+                $account->addPermissions(\is_array($permission) ? $permission : [$permission]);
+            }
+        } else {
+            $account->addPermissions([$accountPermissions]);
+        }
 
         return $account;
     }
diff --git a/Models/Group.php b/Models/Group.php
index 63e450e..bad0bc4 100644
--- a/Models/Group.php
+++ b/Models/Group.php
@@ -59,11 +59,14 @@ class Group extends \phpOMS\Account\Group
     /**
      * Constructor
      *
+     * @param string $name Group name
+     *
      * @since  1.0.0
      */
-    public function __construct()
+    public function __construct(string $name = '')
     {
         $this->createdAt = new \DateTime();
+        $this->setName($name);
     }
 
     /**
diff --git a/Theme/Backend/settings-general.tpl.php b/Theme/Backend/settings-general.tpl.php
index 2cead96..48049bf 100644
--- a/Theme/Backend/settings-general.tpl.php
+++ b/Theme/Backend/settings-general.tpl.php
@@ -10,6 +10,7 @@
  * @version    1.0.0
  * @link       http://website.orange-management.de
  */
+use Modules\Organization\Models\UnitMapper;
 
 /**
  * @var \phpOMS\Views\View $this
@@ -50,7 +51,11 @@ $temperatures = \phpOMS\Utils\Converter\TemperatureType::getConstants();
                                 <table class="layout wf-100">
                                     <tbody>
                                         <tr><td><label for="iOname"><?= $this->getHtml('OrganizationName'); ?></label>
-                                        <tr><td><input id="iOname" name="settings_1000000009" type="text" value="<?= $this->printHtml($settings[1000000009]); ?>" placeholder="&#xf12e; Money Bin" required>
+                                        <tr><td>
+                                            <select id="iOname" name="settings_1000000009">
+                                                <?php $unit = UnitMapper::get((int) $settings[1000000009]); ?>
+                                                    <option value="<?= $this->printHtml($unit->getId()); ?>"><?= $this->printHtml($unit->getName()); ?>
+                                            </select>
                                         <tr><td><input id="iSubmitGeneral" name="submitGeneral" type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>">
                                 </table>
                             </form>