Merge remote-tracking branch 'origin/master'

* origin/master:
  Update CHANGELOG.md
  Update CHANGELOG.md
  Allow setting permissions as children to roles
  Allow setting permission as children to roles

CHANGELOG.md

@@ -1,6 +1,7 @@
 # CHANGELOG
 
 ## 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)
 - Enh #32: Added Italian Translation (maxxer)
 - Fix #30: Prefill username and email in SettingsForm (mattheobjornson)

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,