Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not show routes on Permissions list when advanced config is enabled #409

Closed
wants to merge 2 commits into from
Closed

Do not show routes on Permissions list when advanced config is enabled #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63944f9
Do not show routes on Permissions list when advanced config is enabled
re3lex Oct 19, 2018
f554f7e
Do not show routes on Permissions list when advanced config is enabled.
re3lex Oct 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions models/AuthItem.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,19 +246,20 @@ public function removeChildren($items)
public function getItems()
{
$manager = Configs::authManager();
$advanced = Configs::instance()->advanced;
$available = [];
if ($this->type == Item::TYPE_ROLE) {
foreach (array_keys($manager->getRoles()) as $name) {
$available[$name] = 'role';
}
}
foreach (array_keys($manager->getPermissions()) as $name) {
$available[$name] = $name[0] == '/' ? 'route' : 'permission';
$available[$name] = $name[0] == '/' || $advanced && $name[0] == '@' ? 'route' : 'permission';
}

$assigned = [];
foreach ($manager->getChildren($this->_item->name) as $item) {
$assigned[$item->name] = $item->type == 1 ? 'role' : ($item->name[0] == '/' ? 'route' : 'permission');
$assigned[$item->name] = $item->type == 1 ? 'role' : ($item->name[0] == '/' || $advanced && $item->name[0] == '@' ? 'route' : 'permission');
unset($available[$item->name]);
}
unset($available[$this->name]);
Expand Down
11 changes: 9 additions & 2 deletions models/searchs/AuthItem.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,18 @@ public function search($params)
{
/* @var \yii\rbac\Manager $authManager */
$authManager = Configs::authManager();
$advanced = Configs::instance()->advanced;
if ($this->type == Item::TYPE_ROLE) {
$items = $authManager->getRoles();
} else {
$items = array_filter($authManager->getPermissions(), function($item) {
return $this->type == Item::TYPE_PERMISSION xor strncmp($item->name, '/', 1) === 0;
$items = array_filter($authManager->getPermissions(), function($item) use ($advanced){
$isPermission = $this->type == Item::TYPE_PERMISSION;
if ($advanced) {
return $isPermission xor (strncmp($item->name, '/', 1) === 0 or strncmp($item->name, '@', 1) === 0);
}
else {
return $isPermission xor strncmp($item->name, '/', 1) === 0;
}
});
}
$this->load($params);
Expand Down