instances added god may help
This commit is contained in:
@@ -1,12 +1,11 @@
|
||||
<?php
|
||||
|
||||
use MintyPHP\Router;
|
||||
use MintyPHP\Support\Guard;
|
||||
use MintyPHP\Repository\Access\UserRoleRepository;
|
||||
use MintyPHP\Repository\Access\RolePermissionRepository;
|
||||
use MintyPHP\Service\Access\RoleService;
|
||||
use MintyPHP\Service\Settings\SettingService;
|
||||
use MintyPHP\Service\Access\AccessServicesFactory;
|
||||
use MintyPHP\Service\Access\PermissionService;
|
||||
use MintyPHP\Service\Settings\SettingServicesFactory;
|
||||
use MintyPHP\Service\User\UserServicesFactory;
|
||||
use MintyPHP\Support\Guard;
|
||||
|
||||
Guard::requireLogin();
|
||||
Guard::requirePermission(PermissionService::ROLES_VIEW);
|
||||
@@ -18,7 +17,7 @@ $order = (string) ($_GET['order'] ?? 'description');
|
||||
$dir = (string) ($_GET['dir'] ?? 'asc');
|
||||
$active = (string) ($_GET['active'] ?? '');
|
||||
|
||||
$result = RoleService::listPaged([
|
||||
$result = directoryServicesFactory()->createRoleService()->listPaged([
|
||||
'limit' => $limit,
|
||||
'offset' => $offset,
|
||||
'search' => $search,
|
||||
@@ -27,7 +26,10 @@ $result = RoleService::listPaged([
|
||||
'active' => $active,
|
||||
]);
|
||||
|
||||
$defaultRoleId = SettingService::getDefaultRoleId();
|
||||
$settingsFactory = new SettingServicesFactory();
|
||||
$settingGateway = $settingsFactory->createSettingGateway();
|
||||
$defaultRoleId = $settingGateway->getDefaultRoleId();
|
||||
$rolePermissionRepository = (new AccessServicesFactory())->createRolePermissionRepository();
|
||||
$roleIds = [];
|
||||
foreach ($result['rows'] as $roleRow) {
|
||||
$roleId = (int) ($roleRow['id'] ?? 0);
|
||||
@@ -36,9 +38,10 @@ foreach ($result['rows'] as $roleRow) {
|
||||
}
|
||||
}
|
||||
$roleIds = array_values(array_unique($roleIds));
|
||||
$roleUserCounts = UserRoleRepository::countUsersByRoleIds($roleIds);
|
||||
$roleActiveUserCounts = UserRoleRepository::countActiveUsersByRoleIds($roleIds);
|
||||
$rolePermissionCounts = RolePermissionRepository::countPermissionsByRoleIds($roleIds);
|
||||
$userRoleRepository = (new UserServicesFactory())->createUserRoleRepository();
|
||||
$roleUserCounts = $userRoleRepository->countUsersByRoleIds($roleIds);
|
||||
$roleActiveUserCounts = $userRoleRepository->countActiveUsersByRoleIds($roleIds);
|
||||
$rolePermissionCounts = $rolePermissionRepository->countPermissionsByRoleIds($roleIds);
|
||||
|
||||
$rows = [];
|
||||
foreach ($result['rows'] as $row) {
|
||||
|
||||
Reference in New Issue
Block a user