From eb1e52afddebbdd5984c45a83aad93d7ea325042 Mon Sep 17 00:00:00 2001 From: Kurounin Date: Wed, 2 Aug 2017 23:27:13 +0300 Subject: [PATCH 1/4] Allow setting permission as children to roles --- src/User/Helper/AuthHelper.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/User/Helper/AuthHelper.php b/src/User/Helper/AuthHelper.php index 45a5504..3f7bf91 100644 --- a/src/User/Helper/AuthHelper.php +++ b/src/User/Helper/AuthHelper.php @@ -99,7 +99,8 @@ class AuthHelper public function getUnassignedItems(AbstractAuthItem $model) { $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( $items, From bb0cfabde1a577308ba801369ad5e11ebc4bf623 Mon Sep 17 00:00:00 2001 From: Kurounin Date: Wed, 2 Aug 2017 23:50:24 +0300 Subject: [PATCH 2/4] Allow setting permissions as children to roles --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0df2625..628c7ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # CHANGELOG ## 1.0.10 - Work In Progress +- Fix: Allow setting permissions as children to roles - Fix #37: Fix bower alias in test environment (tekord) - Enh #32: Added Italian Translation (maxxer) - Fix #30: Prefill username and email in SettingsForm (mattheobjornson) From 47d91c3afe0713741dbb3fc38eb7382b8b3d5183 Mon Sep 17 00:00:00 2001 From: Antonio Ramirez Date: Thu, 3 Aug 2017 10:08:03 +0200 Subject: [PATCH 3/4] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 628c7ee..35105ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # CHANGELOG ## 1.0.10 - Work In Progress -- Fix: Allow setting permissions as children to roles +- Fix: Allow setting permissions as children to roles (kurounin) - Fix #37: Fix bower alias in test environment (tekord) - Enh #32: Added Italian Translation (maxxer) - Fix #30: Prefill username and email in SettingsForm (mattheobjornson) From be1205a2afcbf785c5130eeca526ba2fa912d1f9 Mon Sep 17 00:00:00 2001 From: Antonio Ramirez Date: Thu, 3 Aug 2017 10:08:49 +0200 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35105ba..0067fce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # CHANGELOG ## 1.0.10 - Work In Progress -- Fix: Allow setting permissions as children to roles (kurounin) +- Fix #42: Allow setting permissions as children to roles (kurounin) - Fix #37: Fix bower alias in test environment (tekord) - Enh #32: Added Italian Translation (maxxer) - Fix #30: Prefill username and email in SettingsForm (mattheobjornson)