Jingga/oms-Admin
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Admin.git synced 2026-02-16 20:38:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make fixes for new datamapper

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-03-13 23:30:58 +01:00
parent c6591795c4
commit 5b8b59a1f8
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Controller/BackendController.php
View File

@ -14,10 +14,8 @@ declare(strict_types=1);
namespace Modules\Admin\Controller; namespace Modules\Admin\Controller;
use Modules\Admin\Models\Account;
use Modules\Admin\Models\AccountMapper; use Modules\Admin\Models\AccountMapper;
use Modules\Admin\Models\AccountPermissionMapper; use Modules\Admin\Models\AccountPermissionMapper;
use Modules\Admin\Models\Group;
use Modules\Admin\Models\GroupMapper; use Modules\Admin\Models\GroupMapper;
use Modules\Admin\Models\GroupPermissionMapper; use Modules\Admin\Models\GroupPermissionMapper;
use Modules\Admin\Models\NullAccountPermission; use Modules\Admin\Models\NullAccountPermission;
@ -138,7 +136,7 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Admin/Theme/Backend/accounts-single'); $view->setTemplate('/Modules/Admin/Theme/Backend/accounts-single');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000104001, $request, $response));
$view->addData('account', AccountMapper::get((int) $request->getData('id'), RelationType::ALL, null, 2)); $view->addData('account', AccountMapper::get((int) $request->getData('id'), RelationType::ALL, 2));
$permissions = AccountPermissionMapper::getFor((int) $request->getData('id'), 'account'); $permissions = AccountPermissionMapper::getFor((int) $request->getData('id'), 'account');
@ -213,7 +211,7 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Admin/Theme/Backend/groups-single'); $view->setTemplate('/Modules/Admin/Theme/Backend/groups-single');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000103001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000103001, $request, $response));
$view->addData('group', GroupMapper::get((int) $request->getData('id'), RelationType::ALL, null, 2)); $view->addData('group', GroupMapper::get((int) $request->getData('id'), RelationType::ALL, 2));
$permissions = GroupPermissionMapper::getFor((int) $request->getData('id'), 'group'); $permissions = GroupPermissionMapper::getFor((int) $request->getData('id'), 'group');

4
Models/AccountMapper.php
View File

@ -115,7 +115,7 @@ final class AccountMapper extends DataMapperAbstract
public static function getWithPermissions(int $id) : Account public static function getWithPermissions(int $id) : Account
{ {
$account = self::get($id); $account = self::get($id);
$groupPermissions = GroupPermissionMapper::getFor(\array_keys($account->getGroups()), 'group', RelationType::ALL, null, 2); $groupPermissions = GroupPermissionMapper::getFor(\array_keys($account->getGroups()), 'group', RelationType::ALL, 2);
if (\is_array($groupPermissions)) { if (\is_array($groupPermissions)) {
foreach ($groupPermissions as $permission) { foreach ($groupPermissions as $permission) {
@ -125,7 +125,7 @@ final class AccountMapper extends DataMapperAbstract
$account->addPermissions([$groupPermissions]); $account->addPermissions([$groupPermissions]);
} }
$accountPermissions = AccountPermissionMapper::getFor($id, 'account', RelationType::ALL, null, 2); $accountPermissions = AccountPermissionMapper::getFor($id, 'account', RelationType::ALL, 2);
if (\is_array($accountPermissions)) { if (\is_array($accountPermissions)) {
foreach ($accountPermissions as $permission) { foreach ($accountPermissions as $permission) {

4
Models/LocalizationMapper.php
View File

@ -15,12 +15,12 @@ declare(strict_types=1);
namespace Modules\Admin\Models; namespace Modules\Admin\Models;
use phpOMS\DataStorage\Database\DataMapperAbstract; use phpOMS\DataStorage\Database\DataMapperAbstract;
use phpOMS\DataStorage\Database\Query\Builder;
use phpOMS\DataStorage\Database\RelationType; use phpOMS\DataStorage\Database\RelationType;
use phpOMS\Localization\Defaults\CountryMapper; use phpOMS\Localization\Defaults\CountryMapper;
use phpOMS\Localization\Defaults\CurrencyMapper; use phpOMS\Localization\Defaults\CurrencyMapper;
use phpOMS\Localization\Defaults\LanguageMapper; use phpOMS\Localization\Defaults\LanguageMapper;
use phpOMS\Localization\Localization; use phpOMS\Localization\Localization;
use phpOMS\DataStorage\Database\Query\Builder;
/** /**
* Localization mapper. * Localization mapper.
@ -156,6 +156,6 @@ final class LocalizationMapper extends DataMapperAbstract
*/ */
public static function get($primaryKey, int $relations = RelationType::ALL, int $depth = 1, string $ref = null, Builder $query = null) public static function get($primaryKey, int $relations = RelationType::ALL, int $depth = 1, string $ref = null, Builder $query = null)
{ {
return parent::get($primaryKey, $relations, 1); return parent::get($primaryKey, $relations, 2);
} }
} }