From 50f1a978e274c25df0ab444ec9344abf0c2cf398 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 4 Nov 2009 13:18:33 +0000
Subject: [PATCH] Updated group filter.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14742 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../admin/groups/class_groupManagement.inc    | 10 +++----
 .../plugins/admin/groups/group-filter.tpl     |  5 ++++
 .../plugins/admin/groups/group-filter.xml     | 26 ++++++++++++++++++-
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/gosa-core/plugins/admin/groups/class_groupManagement.inc b/gosa-core/plugins/admin/groups/class_groupManagement.inc
index 0c3107aa2..f85567701 100644
--- a/gosa-core/plugins/admin/groups/class_groupManagement.inc
+++ b/gosa-core/plugins/admin/groups/class_groupManagement.inc
@@ -40,13 +40,13 @@ class groupManagement extends management
    
     $this->storagePoints = array(get_ou("groupRDN"));
  
-    // Build filter
-    if (session::global_is_set(get_class($this)."_filter")){
-      $filter= session::global_get(get_class($this)."_filter");
-    } else {
+#   // Build filter
+#   if (session::global_is_set(get_class($this)."_filter")){
+#     $filter= session::global_get(get_class($this)."_filter");
+#   } else {
       $filter = new filter(get_template_path("group-filter.xml", true));
       $filter->setObjectStorage($this->storagePoints);
-    }
+#   }
     $this->setFilter($filter);
 
     // Build headpage
diff --git a/gosa-core/plugins/admin/groups/group-filter.tpl b/gosa-core/plugins/admin/groups/group-filter.tpl
index 52b0b7993..c7ecdbd65 100644
--- a/gosa-core/plugins/admin/groups/group-filter.tpl
+++ b/gosa-core/plugins/admin/groups/group-filter.tpl
@@ -9,6 +9,11 @@
 <div style="border-top:1px solid #AAAAAA"></div>
 
  <div style="border-top:1px solid #AAAAAA"></div>
+
+ {$PRIMARY}&nbsp;<LABEL for='TEMPLATES'>{t}Show primary groups{/t}</LABEL><br>
+ {$SAMBA}&nbsp;<LABEL for='TEMPLATES'>{t}Show samba groups{/t}</LABEL><br>
+ {$MAIL}&nbsp;<LABEL for='TEMPLATES'>{t}Show mail groups{/t}</LABEL><br>
+
  {$SCOPE}
 
  <table summary="" style="width:100%;border-top:1px solid #B0B0B0;">
diff --git a/gosa-core/plugins/admin/groups/group-filter.xml b/gosa-core/plugins/admin/groups/group-filter.xml
index 97b4c634a..98e296fc4 100644
--- a/gosa-core/plugins/admin/groups/group-filter.xml
+++ b/gosa-core/plugins/admin/groups/group-filter.xml
@@ -10,7 +10,7 @@
   <search>
     <query>
       <backend>LDAP</backend>
-      <filter>(&amp;(objectClass=posixGroup))</filter>
+      <filter>(&amp;(objectClass=posixGroup)$NAME(|$PRIMARY$MAIL$SAMBA))</filter>
       <attribute>dn</attribute>
       <attribute>objectClass</attribute>
       <attribute>cn</attribute>
@@ -19,6 +19,30 @@
     <scope>auto</scope>
   </search>
 
+  <element>
+    <type>checkbox</type>
+    <tag>PRIMARY</tag>
+    <default></default>
+    <unset></unset>
+    <set>(!(objectClass=gosaObject))</set>
+  </element>
+
+  <element>
+    <type>checkbox</type>
+    <tag>MAIL</tag>
+    <default>true</default>
+    <unset></unset>
+    <set>(objectClass=gosaMailAccount)</set>
+  </element>
+
+  <element>
+    <type>checkbox</type>
+    <tag>SAMBA</tag>
+    <default>true</default>
+    <unset></unset>
+    <set>(objectClass=sambaGroupMapping)</set>
+  </element>
+
   <element>
     <type>textfield</type>
     <tag>NAME</tag>
-- 
2.30.2