|
From: <gem...@li...> - 2011-09-27 11:19:05
|
Revision: 78
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=78&view=rev
Author: matijsdejong
Date: 2011-09-27 11:18:56 +0000 (Tue, 27 Sep 2011)
Log Message:
-----------
- fixed #7 add role gives errors. Case of no inheritance was the source of this problem
Modified Paths:
--------------
trunk/library/classes/Gems/Default/RoleAction.php
Modified: trunk/library/classes/Gems/Default/RoleAction.php
===================================================================
--- trunk/library/classes/Gems/Default/RoleAction.php 2011-09-27 11:08:50 UTC (rev 77)
+++ trunk/library/classes/Gems/Default/RoleAction.php 2011-09-27 11:18:56 UTC (rev 78)
@@ -85,8 +85,10 @@
//Get inherited privileges and disable tem
$result = $this->escort->acl->getRolePrivileges();
$disable = array();
- foreach($result[$data['grl_name']][MUtil_Acl::INHERITED][Zend_Acl::TYPE_ALLOW] as $key=>$value) {
- $disable[] = $value;
+ if (isset($result[$data['grl_name']][MUtil_Acl::INHERITED][Zend_Acl::TYPE_ALLOW])) {
+ foreach($result[$data['grl_name']][MUtil_Acl::INHERITED][Zend_Acl::TYPE_ALLOW] as $key => $value) {
+ $disable[] = $value;
+ }
}
$checkbox->setAttrib('disable', $disable);
@@ -123,7 +125,9 @@
$values = $checkbox->getValue();
$disabled = $checkbox->getAttrib('disable');
- $values = array_merge($values, $disabled);
+ if ($disabled) {
+ $values = array_merge($values, $disabled);
+ }
$checkbox->setValue($values);
return $form;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|