Removed obsolete filter setting

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@872 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc
index 819838271a7e9894135c894d28c378e7797b7784..15eb4b5065983558a72ee751426c622d1b14eb61 100644 (file)
--- a/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -60,7 +60,6 @@ class ogroupManagement extends plugin
           "servergroups" => "checked",
           "wsgroups" => "checked",
           "prtgroups" => "checked",
-          "emptygroups" => "checked",
           "tcgroups" => "checked",
           "fongroups" => "checked",
           "depselect" => $base,
@@ -83,7 +82,7 @@ class ogroupManagement extends plugin
       }
     }
     if (isset($_POST['depselect'])){
-      foreach( array("usergroups", "groupgroups", "appgroups", "depgroups", "emptygroups",
+      foreach( array("usergroups", "groupgroups", "appgroups", "depgroups",
             "servergroups", "wsgroups", "prtgroups", "tcgroups", "fongroups") as $type){
 
         if (isset($_POST[$type])) {
@@ -285,7 +284,7 @@ class ogroupManagement extends plugin
 
     $smarty->assign("groups", $this->convert_list($this->grouplist));
 
-    foreach( array("usergroups", "groupgroups", "appgroups", "depgroups", "emptygroups",
+    foreach( array("usergroups", "groupgroups", "appgroups", "depgroups",
           "servergroups", "wsgroups", "prtgroups", "tcgroups", "fongroups", "regex", "depselect") as $type){
       $smarty->assign("$type", $ogroupfilter[$type]);
     }
@@ -381,9 +380,6 @@ class ogroupManagement extends plugin
     if ($ogroupfilter['fongroups'] == "checked"){
       $filter.= "(gosaGroupObjects=*F*)";
     }
-    if ($ogroupfilter['emptygroups'] == "checked"){
-      $filter.= "(gosaGroupObjects=[])";
-    }
 
     if ($filter != ""){
       $filter= "(&(cn=$regex)(objectClass=gosaGroupOfNames)(|$filter))";

diff --git a/plugins/admin/ogroups/headpage.tpl b/plugins/admin/ogroups/headpage.tpl
index 1e8d87277528dc03d42fd6c22400f55f7813db79..fb31c5b5dccb2ba8c4cc617dac1cc41dda315889 100644 (file)
--- a/plugins/admin/ogroups/headpage.tpl
+++ b/plugins/admin/ogroups/headpage.tpl
@@ -45,7 +45,6 @@
 <table summary=""  style="width:100%;border-top:1px solid #B0B0B0;"> 
        <tr>
                <td>
-       <input type=checkbox name="emptygroups" value="1" {$emptygroups} onClick="mainform.submit()">{t}Show empty groups{/t}<br>
     <input type=checkbox name="usergroups" value="1" {$usergroups} onClick="mainform.submit()">{t}Show groups containing users{/t}<br>
     <input type=checkbox name="groupgroups" value="1" {$groupgroups} onClick="mainform.submit()">{t}Show groups containing groups{/t}<br>
     <input type=checkbox name="appgroups" value="1" {$appgroups} onClick="mainform.submit()">{t}Show groups containing applications{/t}<br>