API CHANGE Refactored hiding of Permissions added in r92428. Added PermissionCheckboxSetField?->setHiddenPermissions() (from r92865)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@92878 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-11-21 11:05:13 +00:00 committed by Sam Minnee
parent 65b1bc4839
commit 4452101790
3 changed files with 46 additions and 16 deletions

View File

@ -1,12 +1,33 @@
<?php
class PermissionCheckboxSetField extends CheckboxSetField {
/**
* @var Array Filter certain permission codes from the output.
* Useful to simplify the interface
*/
protected $hiddenPermissions = array();
function __construct($name, $title, $managedClass, $filterField, $record = null) {
$this->filterField = $filterField;
$this->managedClass = $managedClass;
$this->record = $record;
parent::__construct($name, $title, Permission::get_codes(true));
}
/**
* @param Array $codes
*/
function setHiddenPermissions($codes) {
$this->hiddenPermissions = $codes;
}
/**
* @return Array
*/
function getHiddenPermissions() {
return $this->hiddenPermissions;
}
function Field() {
Requirements::css(SAPPHIRE_DIR . '/css/CheckboxSetField.css');
@ -69,9 +90,8 @@ class PermissionCheckboxSetField extends CheckboxSetField {
if($source) {
foreach($source as $categoryName => $permissions) {
$options .= "<li><h5>$categoryName</h5></li>";
$hiddens = Permission::$hidden_permissions;
foreach($permissions as $code => $permission) {
if(in_array($code, $hiddens)) continue;
if(in_array($code, $this->hiddenPermissions)) continue;
$key = $code;
$value = $permission['name'];

View File

@ -0,0 +1,24 @@
<?php
/**
* @package sapphire
* @subpackage tests
*/
class PermissionCheckboxSetFieldTest extends SapphireTest {
function testHiddenPermissions() {
$f = new PermissionCheckboxSetField(
'Permissions',
'Permissions',
'Permission',
'GroupID'
);
$f->setHiddenPermissions(
array('CMS_ACCESS_ReportAdmin')
);
$this->assertEquals(
$f->getHiddenPermissions(),
array('CMS_ACCESS_ReportAdmin')
);
$this->assertContains('CMS_ACCESS_CMSMain', $f->Field());
$this->assertNotContains('CMS_ACCESS_ReportAdmin', $f->Field());
}
}

View File

@ -40,18 +40,4 @@ class PermissionTest extends SapphireTest {
// Check that a random permission that shouldn't be there isn't
$this->assertFalse(Permission::checkMember($member, "CMS_ACCESS_SecurityAdmin"));
}
function testHiddenPermissions(){
$permissionCheckboxSet = new PermissionCheckboxSetField('Permissions','Permissions','Permission','GroupID');
$this->assertContains('CMS_ACCESS_CMSMain', $permissionCheckboxSet->Field());
$this->assertContains('CMS_ACCESS_AssetAdmin', $permissionCheckboxSet->Field());
Permission::add_to_hidden_permissions('CMS_ACCESS_CMSMain');
Permission::add_to_hidden_permissions('CMS_ACCESS_AssetAdmin');
$this->assertNotContains('CMS_ACCESS_CMSMain', $permissionCheckboxSet->Field());
$this->assertNotContains('CMS_ACCESS_AssetAdmin', $permissionCheckboxSet->Field());
Permission::remove_from_hidden_permissions('CMS_ACCESS_AssetAdmin');
$this->assertContains('CMS_ACCESS_AssetAdmin', $permissionCheckboxSet->Field());
}
}