From: hickert Date: Tue, 12 Jan 2010 11:59:04 +0000 (+0000) Subject: oDebug stuff X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9d9bd8b4f91a208ee03879fc2639e1cd17a797b3;p=gosa.git oDebug stuff git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15158 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc b/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc index 22010af05..c5d161208 100644 --- a/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc +++ b/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc @@ -7,6 +7,8 @@ class filterSYSTEMS { $ui = get_userinfo(); global $config; + syslog(1,$filter); + // Check whether the arp handling active or not $arp_handling_active = ($config->search("ArpNewDevice","CLASS",array('tabs')) != ""); diff --git a/gosa-plugins/systems/admin/systems/class_systemManagement.inc b/gosa-plugins/systems/admin/systems/class_systemManagement.inc index 1ba0f53aa..4419f078e 100644 --- a/gosa-plugins/systems/admin/systems/class_systemManagement.inc +++ b/gosa-plugins/systems/admin/systems/class_systemManagement.inc @@ -90,12 +90,12 @@ class systemManagement extends management $this->storagePoints = array_unique($sP); // Build filter - if (session::global_is_set(get_class($this)."_filter")){ - $filter= session::global_get(get_class($this)."_filter"); - } else { +# if (session::global_is_set(get_class($this)."_filter")){ +# $filter= session::global_get(get_class($this)."_filter"); +# } else { $filter = new filter(get_template_path("system-filter.xml", true)); $filter->setObjectStorage($this->storagePoints); - } +# } $this->setFilter($filter); // Build headpage diff --git a/gosa-plugins/systems/admin/systems/system-filter.xml b/gosa-plugins/systems/admin/systems/system-filter.xml index cb511afdb..c3161047b 100644 --- a/gosa-plugins/systems/admin/systems/system-filter.xml +++ b/gosa-plugins/systems/admin/systems/system-filter.xml @@ -22,6 +22,42 @@ auto + + textfield + NAME + 20 + 60 + + + (cn=*$*) + false + + SYSTEMS + (cn=*$NAME*) + cn + 0.5 + 3 + + + + + textfield + USER + 20 + 60 + + + (cn=*$*) + false + + SYSTEMS + (&(objectClass=organizationalRole)(cn=*$NAME*)) + cn + 0.5 + 3 + + + checkbox SERVER @@ -95,22 +131,4 @@ (&(objectClass=FAIclass)(FAIstate=__NETBOOT__)) - - textfield - NAME - 20 - 60 - - - (cn=*$*) - false - - SYSTEMS - (&(objectClass=organizationalRole)(cn=*$NAME*)) - cn - 0.5 - 3 - - -