summaryrefslogtreecommitdiffstats
path: root/application/modules/dev/controllers/RoleController.php
diff options
context:
space:
mode:
authorSimon2011-03-28 15:09:04 +0200
committerSimon2011-03-28 15:09:04 +0200
commit7f128bfd11824b832e4e64a1b13011e837c54366 (patch)
tree5806900894bac7374bb5c655752afffb88d489a8 /application/modules/dev/controllers/RoleController.php
parentquickfix gegen account löschen (diff)
parentEinführung von Vererbung von Rollen (diff)
downloadpbs2-7f128bfd11824b832e4e64a1b13011e837c54366.tar.gz
pbs2-7f128bfd11824b832e4e64a1b13011e837c54366.tar.xz
pbs2-7f128bfd11824b832e4e64a1b13011e837c54366.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/dev/controllers/RoleController.php')
-rw-r--r--application/modules/dev/controllers/RoleController.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/application/modules/dev/controllers/RoleController.php b/application/modules/dev/controllers/RoleController.php
index 709d623..65989b6 100644
--- a/application/modules/dev/controllers/RoleController.php
+++ b/application/modules/dev/controllers/RoleController.php
@@ -75,6 +75,7 @@ class dev_RoleController extends Zend_Controller_Action
$_POST['title'] = $role->getTitle();
$_POST['description'] = $role->getDescription();
$_POST['groupID'] = $role->getGroupID();
+ $_POST['inheritance'] = $role->getInheritance();
$editForm = new dev_Form_RoleEdit();
} else {
$editForm = new dev_Form_RoleEdit($_POST);