Commit 3fbed57d authored by Côme Bernigaud's avatar Côme Bernigaud Committed by Benoit Mortier
Browse files

Fixes #3476 Removed acl tabs from most objects

Conflicts:
	plugins/admin/acl/class_aclAssignment.inc
parent ff80e7eb
......@@ -383,6 +383,12 @@ attributetype ( 1.3.6.1.4.1.38414.8.18.5 NAME 'fdDisplayHookOutput'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.8.18.6 NAME 'fdAclTabOnObjects'
DESC 'FusionDirectory - Should acl tabs be shown on all objects'
EQUALITY booleanMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE )
# Plugins
attributetype ( 1.3.6.1.4.1.38414.8.19.1 NAME 'fdOGroupRDN'
......@@ -417,6 +423,7 @@ objectclass ( 1.3.6.1.4.1.38414.8.2.1 NAME 'fusionDirectoryConf'
fdEnableSnapshots $ fdSnapshotBase $ fdSnapshotURI $
fdSnapshotAdminDn $ fdSnapshotAdminPassword $
fdHonourIvbbAttributes $ fdTabHook $ fdShells $ fdDisplayHookOutput $
fdAclTabOnObjects $
fdHonourUnitTags
) )
......
......@@ -242,23 +242,27 @@ class aclAssignment extends simplePlugin
static function plInfo()
{
global $config;
$oc = array(
'aclAssignment' => array(
'aclCategory' => 'acl',
'name' => _('ACL assignment'),
'filter' => 'objectClass=gosaAcl',
'ou' => '',
'icon' => 'geticon.php?context=categories&icon=acl&size=16',
'tabClass' => 'simpleTabs_noSpecial',
'mainAttr' => FALSE
),
);
if ($config->get_cfg_value('aclTabOnObjects') == 'TRUE') {
$oc[] = 'special';
} else {
$oc = array_merge($oc, departmentManagement::getDepartmentTypes());
}
return array(
'plShortName' => _('ACL Assignment'),
'plDescription' => _('Access control roles assignment'),
'plObjectType' => array(
'aclAssignment' => array(
'aclCategory' => 'acl',
'name' => _('ACL assignment'),
'filter' => 'objectClass=gosaAcl',
'ou' => '',
'icon' => 'geticon.php?context=categories&icon=acl&size=16',
'tabClass' => 'simpleTabs_noSpecial',
'mainAttr' => FALSE
),
'special' => array(
'name' => 'special'
),
),
'plObjectType' => $oc,
'plForeignKeys' => array(
'gosaAclEntry' => array(
array('aclRole', 'dn', 'gosaAclEntry=*:*:%b|oldvalue%:*'),
......
......@@ -236,6 +236,11 @@ class configInLdap extends simplePlugin
'fdSnapshotBase', FALSE,
'ou=snapshots,'.$config->current['BASE']
),
new BooleanAttribute (
_('Show ACL tab on all objects'),
_('For very specific ACL rights setting where you might need to give right on a single object.'),
'fdAclTabOnObjects'
),
)
),
'people_and_group' => array(
......
......@@ -26,7 +26,11 @@ class reference extends simplePlugin
"plShortName" => _("References"),
"plDescription" => _("References"),
"plCategory" => array('acl'),
"plObjectType" => array('special'),
"plObjectType" => array(
'special' => array(
'name' => 'special'
)
),
'plPriority' => 10,
"plProvidedAcls" => array()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment