diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 2be8236..1a673d5 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -68,12 +68,6 @@ use phpOMS\Version\Version; * @license OMS License 1.0 * @link https://orange-management.org * @since 1.0.0 - * - * @todo Orange-Management/Modules#172 - * Add user & group settings - * - * @todo Orange-Management/Modules#193 - * Implement online database and downloading api for modules and updates */ final class ApiController extends Controller { diff --git a/Controller/Controller.php b/Controller/Controller.php index bf21540..5f24c10 100755 --- a/Controller/Controller.php +++ b/Controller/Controller.php @@ -15,7 +15,6 @@ declare(strict_types=1); namespace Modules\Admin\Controller; use phpOMS\Module\ModuleAbstract; -use phpOMS\Module\WebInterface; /** * Admin controller class. diff --git a/Models/AccountMapper.php b/Models/AccountMapper.php index 83ca9a6..77bfd6a 100755 --- a/Models/AccountMapper.php +++ b/Models/AccountMapper.php @@ -119,9 +119,6 @@ final class AccountMapper extends DataMapperAbstract * * @return Account * - * @todo Orange-Management/oms-Admin#11 - * [AccountMapper] Create test for getWithPermission() - * * @since 1.0.0 */ public static function getWithPermissions(int $id) : Account @@ -187,7 +184,6 @@ final class AccountMapper extends DataMapperAbstract $result = $result[0]; - // @todo: implement account tries if ($result['account_tries'] <= 0) { return LoginReturnType::WRONG_INPUT_EXCEEDED; } diff --git a/Theme/Backend/accounts-single.tpl.php b/Theme/Backend/accounts-single.tpl.php index 76ba272..aa99e52 100755 --- a/Theme/Backend/accounts-single.tpl.php +++ b/Theme/Backend/accounts-single.tpl.php @@ -19,21 +19,6 @@ use phpOMS\Account\PermissionType; use phpOMS\Message\Http\HttpHeader; use phpOMS\Uri\UriFactory; -/** - * @todo Orange-Management/Modules#122 - * Add group account removal - * In front of every account there should be a red x which allows to remove an account from the group. - * - * @todo Orange-Management/Modules#127 - * Add account group removal - * Add red x in front of every group which removes the group for this account. - * - * @todo Orange-Management/Modules#126 - * Add account log tab - * Add auditing log tab to accounts for whenever something changes for an account. - * This tab should show everything this user is doing and all places where he is mentioned. - */ - /** * @var \phpOMS\Views\View $this */ diff --git a/Theme/Backend/groups-single.tpl.php b/Theme/Backend/groups-single.tpl.php index d24787f..8471f0b 100755 --- a/Theme/Backend/groups-single.tpl.php +++ b/Theme/Backend/groups-single.tpl.php @@ -18,32 +18,6 @@ use phpOMS\Account\PermissionType; use phpOMS\Message\Http\HttpHeader; use phpOMS\Uri\UriFactory; -/** - * @todo Orange-Management/Modules#122 - * Add group account removal - * In front of every account there should be a red x which allows to remove an account from the group. - * - * @todo Orange-Management/Modules#127 - * Add account group removal - * Add red x in front of every group which removes the group for this account. - * - * @todo Orange-Management/Modules#124 - * Add group permission removal - * Add a red x in front of every permission which removes the permission from the group. - * - * @todo Orange-Management/Modules#123 - * Add group permission adjustment - * In front of every permission there should be a cogs sign for modifying permissions. - * Clicking on it will put the info into the form below and change the button from add to update. - * At the same time there should be a clear button which allows to clear all these info and show the add button again. - * Alternatively the modification could be done inline in the permission list. - * - * @todo Orange-Management/Modules#125 - * Add group log tab for audits - * A new tab should be added where all changes can be audited if required. - * This tab should also show all the places where the group is mentioned. - */ - /** * @var \phpOMS\Views\View $this */ diff --git a/Theme/Backend/modules-list.tpl.php b/Theme/Backend/modules-list.tpl.php index 816a642..14718ad 100755 --- a/Theme/Backend/modules-list.tpl.php +++ b/Theme/Backend/modules-list.tpl.php @@ -38,20 +38,20 @@ $isntalled = $this->getData('isntalled') ?? []; $module) : ++$count; - $url = UriFactory::build('{/prefix}admin/module/settings?{?}&id=' . $module['name']['internal']); + $url = UriFactory::build('{/prefix}admin/module/settings?{?}&id=' . $module->getInternalName()); - if (isset($active[$module['name']['internal']])) { + if (isset($active[$module->getInternalName()])) { $status = ModuleStatus::ACTIVE; - } elseif (isset($installed[$module['name']['internal']])) { + } elseif (isset($installed[$module->getInternalName()])) { $status = ModuleStatus::INACTIVE; } else { $status = ModuleStatus::AVAILABLE; } ?> - printHtml($module['name']['id']); ?> - printHtml($module['name']['external']); ?> - printHtml($module['version']); ?> + printHtml($module->getId()); ?> + printHtml($module->getExternalName()); ?> + printHtml($module->getVersion()); ?> diff --git a/Theme/Backend/modules-single.tpl.php b/Theme/Backend/modules-single.tpl.php index b05d7e7..5e18ba0 100755 --- a/Theme/Backend/modules-single.tpl.php +++ b/Theme/Backend/modules-single.tpl.php @@ -47,26 +47,26 @@ if ($nav !== null) {
-
printHtml($modules[$id]['name']['external']); ?>
+
printHtml($modules[$id]->getExternalName()); ?>
getHtml('Name'); ?> - printHtml($modules[$id]['name']['external']); ?> + printHtml($modules[$id]->getExternalName()); ?>
getHtml('Version'); ?> - printHtml($modules[$id]['version']); ?> + printHtml($modules[$id]->getVersion()); ?>
getHtml('CreatedBy'); ?> - printHtml($modules[$id]['creator']['name']); ?> + printHtml($modules[$id]->get()['creator']['name']); ?>
getHtml('Website'); ?> - printHtml($modules[$id]['creator']['website']); ?> + printHtml($modules[$id]->get()['creator']['website']); ?>
getHtml('Description'); ?> - printHtml($modules[$id]['description']); ?> + printHtml($modules[$id]->get()['description']); ?>