Skip to content

Commit 784a5a8

Browse files
committed
fix issue #94
1 parent 209798e commit 784a5a8

4 files changed

Lines changed: 16 additions & 8 deletions

File tree

components/AuthHelper.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,9 @@ public static function unifyRoute($route)
176176
*/
177177
public static function getChildrenByType($itemName, $childType)
178178
{
179-
$children = (new DbManager())->getChildren($itemName);
179+
$dbManager = Yii::$app->authManager instanceof DbManager ? : new DbManager();
180+
181+
$children = $dbManager->getChildren($itemName);
180182

181183
$result = [];
182184

controllers/PermissionController.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
use webvimark\modules\UserManagement\models\rbacDB\search\PermissionSearch;
1111
use webvimark\components\AdminDefaultController;
1212
use webvimark\modules\UserManagement\UserManagementModule;
13-
use yii\db\Query;
1413
use Yii;
15-
use yii\rbac\DbManager;
1614

1715
class PermissionController extends AdminDefaultController
1816
{

controllers/RoleController.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function actionView($id)
3232
{
3333
$role = $this->findModel($id);
3434

35-
$authManager = new DbManager();
35+
$authManager = Yii::$app->authManager instanceof DbManager ? : new DbManager();
3636

3737
$allRoles = Role::find()
3838
->asArray()
@@ -72,7 +72,9 @@ public function actionSetChildRoles($id)
7272

7373
$newChildRoles = Yii::$app->request->post('child_roles', []);
7474

75-
$children = (new DbManager())->getChildren($role->name);
75+
$dbManager = Yii::$app->authManager instanceof DbManager ? : new DbManager();
76+
77+
$children = $dbManager->getChildren($role->name);
7678

7779
$oldChildRoles = [];
7880

@@ -108,7 +110,9 @@ public function actionSetChildPermissions($id)
108110

109111
$newChildPermissions = Yii::$app->request->post('child_permissions', []);
110112

111-
$oldChildPermissions = array_keys((new DbManager())->getPermissionsByRole($role->name));
113+
$dbManager = Yii::$app->authManager instanceof DbManager ? : new DbManager();
114+
115+
$oldChildPermissions = array_keys($dbManager->getPermissionsByRole($role->name));
112116

113117
$toRemove = array_diff($oldChildPermissions, $newChildPermissions);
114118
$toAdd = array_diff($newChildPermissions, $oldChildPermissions);

models/rbacDB/Role.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ class Role extends AbstractItem
1818
*/
1919
public static function getUserRoles($userId)
2020
{
21-
return (new DbManager())->getRolesByUser($userId);
21+
$dbManager = Yii::$app->authManager instanceof DbManager ? : new DbManager();
22+
23+
return $dbManager->getRolesByUser($userId);
2224
}
2325

2426
/**
@@ -31,7 +33,9 @@ public static function getUserRoles($userId)
3133
*/
3234
public static function getPermissionsByRole($roleName, $asArray = true)
3335
{
34-
$rbacPermissions = (new DbManager())->getPermissionsByRole($roleName);
36+
$dbManager = Yii::$app->authManager instanceof DbManager ? : new DbManager();
37+
38+
$rbacPermissions = $dbManager->getPermissionsByRole($roleName);
3539

3640
$permissionNames = ArrayHelper::map($rbacPermissions, 'name', 'description');
3741

0 commit comments

Comments
 (0)