From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 19 Nov 2009 12:41:45 +0000 (+0000)
Subject: Updated device handling.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=72fe11e614499266e2d8efc4c24fe93685b29b0a;p=gosa.git

Updated device handling.


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

diff --git a/gosa-plugins/goto/admin/devices/device-filter.tpl b/gosa-plugins/goto/admin/devices/device-filter.tpl
index 8f83a74b4..ba7af5cde 100644
--- a/gosa-plugins/goto/admin/devices/device-filter.tpl
+++ b/gosa-plugins/goto/admin/devices/device-filter.tpl
@@ -8,6 +8,8 @@
 
 <div style="border-top:1px solid #AAAAAA"></div>
 
+ {$SCOPE}
+
  <table summary="" style="width:100%;border-top:1px solid #B0B0B0;">
   <tr>
    <td>
diff --git a/gosa-plugins/goto/admin/devices/device-filter.xml b/gosa-plugins/goto/admin/devices/device-filter.xml
index 3e6338bd0..6493c0bbf 100644
--- a/gosa-plugins/goto/admin/devices/device-filter.xml
+++ b/gosa-plugins/goto/admin/devices/device-filter.xml
@@ -16,17 +16,9 @@
       <attribute>cn</attribute>
       <attribute>description</attribute>
     </query>
-    <scope>one</scope>
+    <scope>auto</scope>
   </search>
 
-  <element>
-    <tag>RELEASE</tag>
-    <type>combobox</type>
-    <value>Loading.</value>
-    <value>Loading..</value>
-    <value>Loading...</value>
-  </element>
-
   <element>
     <type>textfield</type>
     <tag>NAME</tag>
@@ -34,11 +26,11 @@
     <maxlength>60</maxlength>
     <default></default>
     <unset></unset>
-    <set>(|(cn=*$*)(description=*$*))</set>
-    <alphabet>true</alphabet>
+    <set>(cn=*$*)</set>
+    <alphabet>false</alphabet>
     <autocomplete>
       <backend>LDAP</backend>
-      <filter>(&amp;(objectClass=gotoDevice)(|(cn=*$NAME*)(description=*$NAME*)))</filter>
+      <filter>(&amp;(objectClass=gotoDevice)(cn=*$NAME*))</filter>
       <attribute>cn</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>