Commit d302d596 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Fixes #5532 Added basic support for ogroup in ogroup. Removed obsolete...

Fixes #5532 Added basic support for ogroup in ogroup. Removed obsolete winstation objectType usages.
parent e167a9dd
......@@ -22,8 +22,10 @@
class objectSelect extends userSelect
{
protected $objectTypes = array(
'user', 'application', 'terminal', 'workstation',
'winstation', 'server', 'printer', 'phone', 'simpleSecurityObject'
'user', 'ogroup',
'application',
'terminal', 'workstation', 'server', 'printer', 'phone',
'simpleSecurityObject'
);
protected $autoFilterAttributes = array('dn', 'cn', 'uid', 'description');
}
......
......@@ -338,7 +338,6 @@ class groupManagement extends simpleManagement
array(
array('id' => 'SERVER', 'label' => _('Show server groups')),
array('id' => 'WORKSTATION', 'label' => _('Show workstation groups')),
array('id' => 'WINDOWS', 'label' => _('Show windows groups')),
array('id' => 'TERMINAL', 'label' => _('Show terminal groups')),
array('id' => 'PRINTER', 'label' => _('Show printer groups')),
array('id' => 'PHONE', 'label' => _('Show phone groups')),
......
......@@ -27,7 +27,7 @@ class ObjectsAttribute extends GenericDialogAttribute
function getFilterBlackList ()
{
return array(
'dn' => array_merge($this->getValue(), $this->plugin->used_workstations)
'dn' => array_merge($this->getValue(), $this->plugin->used_workstations, array($this->plugin->dn))
);
}
......@@ -138,11 +138,10 @@ class ogroup extends simplePlugin
static $objectTypes = array(
'U' => 'user',
'G' => 'group',
'G' => 'ogroup',
'A' => 'application',
'S' => 'server',
'W' => 'workstation',
'O' => 'winstation',
'T' => 'terminal',
'F' => 'phone',
'P' => 'printer',
......@@ -167,11 +166,10 @@ class ogroup extends simplePlugin
'plForeignKeys' => array(
'member' => array(
array('user'),
array('posixGroup'),
array('ogroup'),
array('applicationGeneric'),
array('serverGeneric'),
array('workstationGeneric'),
array('winstationGeneric'),
array('terminalGeneric'),
array('phoneGeneric'),
array('printGeneric'),
......
......@@ -10,7 +10,7 @@
<search>
<query>
<backend>LDAP</backend>
<filter>(&amp;(|$PRIMARY$MAIL$SAMBA$ROLE$FILTERTEMPLATE(&amp;(objectClass=groupOfNames)(|(gosaGroupObjects=[])$USER$GROUP$APPLICATION$SERVER$WORKSTATION$WINDOWS$TERMINAL$PRINTER$PHONE$SIMPLESECURITYOBJECT$UNKNOWN)))$NAME)</filter>
<filter>(&amp;(|$PRIMARY$MAIL$SAMBA$ROLE$FILTERTEMPLATE(&amp;(objectClass=groupOfNames)(|(gosaGroupObjects=[])$USER$GROUP$APPLICATION$SERVER$WORKSTATION$TERMINAL$PRINTER$PHONE$SIMPLESECURITYOBJECT$UNKNOWN)))$NAME)</filter>
<attribute>*</attribute>
</query>
<scope>auto</scope>
......@@ -96,14 +96,6 @@
<set>(gosaGroupObjects=*W*)</set>
</element>
<element>
<type>checkbox</type>
<tag>WINDOWS</tag>
<default>true</default>
<unset></unset>
<set>(gosaGroupObjects=*O*)</set>
</element>
<element>
<type>checkbox</type>
<tag>TERMINAL</tag>
......
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