From 9d233a77d162ee7889e1a283536e5a61b6e8d90f Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 28 Jan 2010 08:54:54 +0000
Subject: [PATCH] Updated objectSelection

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15396 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../objectSelect/class_objectSelect.inc       |  1 -
 .../objectSelect/selectObject-filter.xml      | 21 ++++++--
 .../objectSelect/selectObject-list.tpl        |  4 +-
 .../objectSelect/selectObject-list.xml        | 48 +++++++++++++++++++
 4 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/gosa-core/plugins/admin/ogroups/objectSelect/class_objectSelect.inc b/gosa-core/plugins/admin/ogroups/objectSelect/class_objectSelect.inc
index e8e6130c2..e90676e28 100644
--- a/gosa-core/plugins/admin/ogroups/objectSelect/class_objectSelect.inc
+++ b/gosa-core/plugins/admin/ogroups/objectSelect/class_objectSelect.inc
@@ -31,7 +31,6 @@ class objectSelect extends management
     $this->config = $config;
     $this->ui = $ui;
     $this->storagePoints = array(
-        "",
         get_ou("userRDN"), 
         get_ou("groupRDN"),
         get_ou("terminalRDN"),
diff --git a/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-filter.xml b/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-filter.xml
index 7e5ecf959..be500d5ce 100644
--- a/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-filter.xml
+++ b/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-filter.xml
@@ -10,7 +10,18 @@
   <search>
     <query>
       <backend>LDAPBlacklist</backend>
-      <filter>(&amp;(| $DEPARTMENT $USER $GROUP $SERVER $WORKSTATION $TERMINAL $PRINTER $PHONE ) $NAME)</filter>
+      <filter>(&amp;(| $USER $GROUP $SERVER $WORKSTATION $TERMINAL $PRINTER $PHONE) $NAME)</filter>
+      <attribute>dn</attribute>
+      <attribute>objectClass</attribute>
+      <attribute>cn</attribute>
+      <attribute>sn</attribute>
+      <attribute>uid</attribute>
+      <attribute>givenName</attribute>
+      <attribute>description</attribute>
+    </query>
+    <query>
+      <backend>LDAPDepartmentBlacklist</backend>
+      <filter>(&amp;(| $DEPARTMENT)  $NAME)</filter>
       <attribute>dn</attribute>
       <attribute>objectClass</attribute>
       <attribute>cn</attribute>
@@ -29,12 +40,16 @@
     <maxlength>60</maxlength>
     <default></default>
     <unset></unset>
-    <set>(|(cn=*$*)(sn=*$*)(givenName=*$*))</set>
+    <set>(|(cn=*$*)(sn=*$*)(givenName=*$*)(ou=*$*)(dc=*$*)(c=*$*)(l=*$*))</set>
     <alphabet>true</alphabet>
     <autocomplete>
       <backend>LDAPBlacklist</backend>
-      <filter>(&amp;(|(objectClass=gosaDepartment)(objectClass=gosaAccount)(objectClass=posixGroup)(objectClass=goServer)(objectClass=gotoWorkstation)(objectClass=gotoTerminal)(objectClass=gotoPrinter)(objectClass=goFonHardware))(|(cn=*$NAME*)(sn=*$NAME*)(givenName=*$NAME*)))</filter>
+      <filter>(&amp;(|(objectClass=gosaDepartment)(objectClass=gosaAccount)(objectClass=posixGroup)(objectClass=goServer)(objectClass=gotoWorkstation)(objectClass=gotoTerminal)(objectClass=gotoPrinter)(objectClass=goFonHardware))(|(cn=*$NAME*)(sn=*$NAME*)(givenName=*$NAME*)(ou=*$NAME*)(dc=*$NAME*)(c=*$NAME*)(l=*$NAME*)))</filter>
       <attribute>cn</attribute>
+      <attribute>l</attribute>
+      <attribute>o</attribute>
+      <attribute>dc</attribute>
+      <attribute>c</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>
     </autocomplete>
diff --git a/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-list.tpl b/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-list.tpl
index e15cf19b6..ced417586 100644
--- a/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-list.tpl
+++ b/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-list.tpl
@@ -31,9 +31,9 @@
 
 <p class='separator'>&nbsp;</p>
   <p style="text-align:right">
-  <input type=submit name="userGroupSelect_save" value="{msgPool type=okButton}">
+  <input type=submit name="objectSelect_save" value="{msgPool type=okButton}">
   &nbsp;
-  <input type=submit name="userGroupSelect_cancel" value="{msgPool type=cancelButton}">
+  <input type=submit name="objectSelect_cancel" value="{msgPool type=cancelButton}">
 </p>
 
 <input type="hidden" name="ignore">
diff --git a/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-list.xml b/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-list.xml
index 427dc1ee7..27e68d887 100644
--- a/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-list.xml
+++ b/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-list.xml
@@ -11,6 +11,54 @@
     <label>Please select the desired entries</label>
     <defaultSortColumn>1</defaultSortColumn>
 
+    <objectType>
+      <label>Department</label>
+      <objectClass>gosaDepartment</objectClass>
+      <category>department</category>
+      <class>department</class>
+      <image>images/lists/folder.png</image>
+    </objectType>
+
+    <objectType>
+      <label>Server</label>
+      <objectClass>goServer</objectClass>
+      <category>server</category>
+      <class>servgeneric</class>
+      <image>plugins/systems/images/select_server.png</image>
+    </objectType>
+
+    <objectType>
+      <label>Workstation</label>
+      <objectClass>gotoWorkstation</objectClass>
+      <category>workstation</category>
+      <class>workgeneric</class>
+      <image>plugins/systems/images/select_workstation.png</image>
+    </objectType>
+
+    <objectType>
+      <label>Terminal</label>
+      <objectClass>gotoTerminal</objectClass>
+      <category>terminal</category>
+      <class>termgeneric</class>
+      <image>plugins/systems/images/select_terminal.png</image>
+    </objectType>
+
+    <objectType>
+      <label>Printer</label>
+      <objectClass>gotoPrinter</objectClass>
+      <category>printer</category>
+      <class>printGeneric</class>
+      <image>plugins/systems/images/select_printer.png</image>
+    </objectType>
+
+    <objectType>
+      <label>Phone</label>
+      <objectClass>goFonHardware</objectClass>
+      <category>phone</category>
+      <class>phoneGeneric</class>
+      <image>plugins/systems/images/select_phone.png</image>
+    </objectType>
+
     <objectType>
       <label>User</label>
       <objectClass>gosaAccount</objectClass>
-- 
2.30.2