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

Fixes #4569 Groups containing only unknown objects should still appear

parent ac7d09f1
......@@ -131,7 +131,7 @@ class groupManagement extends simpleManagement
array('id' => 'PRIMARY', 'label' => _('Show primary groups')),
array('id' => 'ROLE', 'label' => _('Show organizational roles')),
array('id' => 'APPLICATION', 'label' => _('Show application groups')),
array('id' => 'DEPARTMENT', 'label' => _('Show department groups')),
array('id' => 'UNKNOWN', 'label' => _('Show unidentified groups')),
);
if (class_available('mailAccount')) {
$filters[]= array('id' => 'MAIL', 'label' => _('Show mail groups'));
......
......@@ -10,7 +10,7 @@
<search>
<query>
<backend>LDAP</backend>
<filter>(&amp;(|(&amp;(objectClass=posixGroup)(|$PRIMARY$MAIL$SAMBA))$ROLE(&amp;(objectClass=groupOfNames)(|(gosaGroupObjects=[])$USER$GROUP$APPLICATION$DEPARTMENT$SERVER$WORKSTATION$WINDOWS$TERMINAL$PRINTER$PHONE)))$NAME)</filter>
<filter>(&amp;(|(&amp;(objectClass=posixGroup)(|$PRIMARY$MAIL$SAMBA))$ROLE(&amp;(objectClass=groupOfNames)(|(gosaGroupObjects=[])$USER$GROUP$APPLICATION$SERVER$WORKSTATION$WINDOWS$TERMINAL$PRINTER$PHONE$UNKNOWN)))$NAME)</filter>
<attribute>dn</attribute>
<attribute>objectClass</attribute>
<attribute>cn</attribute>
......@@ -76,14 +76,6 @@
<set>(gosaGroupObjects=*A*)</set>
</element>
<element>
<type>checkbox</type>
<tag>DEPARTMENT</tag>
<default>true</default>
<unset></unset>
<set>(gosaGroupObjects=*D*)</set>
</element>
<element>
<type>checkbox</type>
<tag>SERVER</tag>
......@@ -132,6 +124,14 @@
<set>(gosaGroupObjects=*F*)</set>
</element>
<element>
<type>checkbox</type>
<tag>UNKNOWN</tag>
<default>false</default>
<unset></unset>
<set>(gosaGroupObjects=*I*)</set>
</element>
<element>
<type>textfield</type>
<tag>NAME</tag>
......
Supports Markdown
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