Updated systems filter to include gotoLastUser

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15159 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 c5d1612086d31adb2bac9bdf5ff15f67e0aa2238..22010af058aafb5ce91df6f870f7e7e9a0f6c152 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc
+++ b/gosa-plugins/systems/admin/systems/class_filterSYSTEMS.inc
@@ -7,8 +7,6 @@ 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 4419f078e18abd233962ce178b1b658a725318fe..1ba0f53aad4f017fc33d04b3542e5c4b603ad988 100644 (file)
--- 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.tpl b/gosa-plugins/systems/admin/systems/system-filter.tpl
index d373e1e11c818fa049ca99845ec1c2c3717e6bca..32ada150056e62939179bda3622a950c60e1da28 100644 (file)
--- a/gosa-plugins/systems/admin/systems/system-filter.tpl
+++ b/gosa-plugins/systems/admin/systems/system-filter.tpl
@@ -50,6 +50,16 @@
     {$NAME}
    </td>
   </tr>
+  <tr>
+   <td>
+    <label for="NAME">
+     <img src="plugins/users/images/select_user.png" align=middle>&nbsp;User
+    </label>
+   </td>
+   <td>
+    {$USER}
+   </td>
+  </tr>
  </table>
 
  <table summary=""  width="100%"  style="background:#EEEEEE;border-top:1px solid #B0B0B0;">

diff --git a/gosa-plugins/systems/admin/systems/system-filter.xml b/gosa-plugins/systems/admin/systems/system-filter.xml
index c3161047b9ea0171420d5a7a67b5d7e69b1a9565..129560870aaa4bd0619423a4589f042967b2fbdb 100644 (file)
--- a/gosa-plugins/systems/admin/systems/system-filter.xml
+++ b/gosa-plugins/systems/admin/systems/system-filter.xml
@@ -10,7 +10,7 @@
   <search>
     <query>
       <backend>SYSTEMS</backend>
-      <filter>(&amp;(|$SERVER $WORKSTATION $TERMINAL $PRINTER $COMPONENT $WINSTATION $INCOMING $OPSI)$NAME)</filter>
+      <filter>(&amp;(|$SERVER $WORKSTATION $TERMINAL $PRINTER $COMPONENT $WINSTATION $INCOMING $OPSI)$NAME $USER)</filter>
       <attribute>dn</attribute>
       <attribute>objectClass</attribute>
       <attribute>cn</attribute>
@@ -18,6 +18,7 @@
       <attribute>gotoMode</attribute>
       <attribute>FAIstate</attribute>
       <attribute>macAddress</attribute>
+      <attribute>gotoLastUser</attribute>
     </query>
     <scope>auto</scope>
   </search>
@@ -47,11 +48,11 @@
     <maxlength>60</maxlength>
     <default></default>
     <unset></unset>
-    <set>(cn=*$*)</set>
+    <set>(gotoLastUser=*$*)</set>
     <alphabet>false</alphabet>
     <autocomplete>
       <backend>SYSTEMS</backend>
-      <filter>(&amp;(objectClass=organizationalRole)(cn=*$NAME*))</filter>
+      <filter>(gotoLastUser=*USER*)</filter>
       <attribute>cn</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>