leonardo/yii2-usuario
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #42 from Kurounin/master

Browse Source 
Allow setting permissions as children to roles
This commit is contained in:
Antonio Ramirez
2017-08-03 10:09:04 +02:00
committed by GitHub
parent db4458ab12 be1205a2af
commit 087a4500ca
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,6 +1,7 @@
# CHANGELOG # CHANGELOG
## 1.0.10 - Work In Progress ## 1.0.10 - Work In Progress
- Fix #42: Allow setting permissions as children to roles (kurounin)
- Fix #37: Fix bower alias in test environment (tekord) - Fix #37: Fix bower alias in test environment (tekord)
- Enh #32: Added Italian Translation (maxxer) - Enh #32: Added Italian Translation (maxxer)
- Fix #30: Prefill username and email in SettingsForm (mattheobjornson) - Fix #30: Prefill username and email in SettingsForm (mattheobjornson)

3
src/User/Helper/AuthHelper.php
View File

@ -99,7 +99,8 @@ class AuthHelper
public function getUnassignedItems(AbstractAuthItem $model) public function getUnassignedItems(AbstractAuthItem $model)
{ {
$excludeItems = $model->item !== null ? [$model->item->name] : []; $excludeItems = $model->item !== null ? [$model->item->name] : [];
$items = $this->getAuthManager()->getItems($model->getType(), $excludeItems); $type = $model->getType() == Permission::TYPE_PERMISSION ?: null;
$items = $this->getAuthManager()->getItems($type, $excludeItems);
return ArrayHelper::map( return ArrayHelper::map(
$items, $items,