From a41ce5902c3667b6d3229db6b30dc4fd17b4ea40 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 7 Jan 2010 16:34:07 +0000
Subject: [PATCH] Updated filter

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15116 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../systems/admin/systems/system-filter.xml   | 12 ++--
 .../systems/admin/systems/system-list.xml     | 66 +++++++++++++++----
 2 files changed, 59 insertions(+), 19 deletions(-)

diff --git a/gosa-plugins/systems/admin/systems/system-filter.xml b/gosa-plugins/systems/admin/systems/system-filter.xml
index d1e73ab14..ce97b9138 100644
--- 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>LDAP</backend>
-      <filter>(&amp;(|$SERVER(objectClass=goServer))$NAME)</filter>
+      <filter>(&amp;(|$SERVER $WORKSTATION $TERMINAL $PRINTER $COMPONENT )$NAME)</filter>
       <attribute>dn</attribute>
       <attribute>objectClass</attribute>
       <attribute>cn</attribute>
@@ -32,7 +32,7 @@
     <tag>WORKSTATION</tag>
     <default>true</default>
     <unset></unset>
-    <set>(objectClass=goWorkstation)</set>
+    <set>(objectClass=gotoWorkstation)</set>
   </element>
 
   <element>
@@ -40,7 +40,7 @@
     <tag>TERMINAL</tag>
     <default>true</default>
     <unset></unset>
-    <set>(objectClass=goWorkstation)</set>
+    <set>(objectClass=gotoTerminal)</set>
   </element>
 
   <element>
@@ -48,7 +48,7 @@
     <tag>PRINTER</tag>
     <default>true</default>
     <unset></unset>
-    <set>(objectClass=goWorkstation)</set>
+    <set>(objectClass=gotoPrinter)</set>
   </element>
 
   <element>
@@ -56,7 +56,7 @@
     <tag>PHONE</tag>
     <default>true</default>
     <unset></unset>
-    <set>(objectClass=goWorkstation)</set>
+    <set>(objectClass=goFonHardware)</set>
   </element>
 
   <element>
@@ -72,7 +72,7 @@
     <tag>COMPONENT</tag>
     <default>true</default>
     <unset></unset>
-    <set>(objectClass=goWorkstation)</set>
+    <set>(objectClass=ieee802Device)</set>
   </element>
 
   <element>
diff --git a/gosa-plugins/systems/admin/systems/system-list.xml b/gosa-plugins/systems/admin/systems/system-list.xml
index cbc46254e..5f3b1d6ea 100644
--- a/gosa-plugins/systems/admin/systems/system-list.xml
+++ b/gosa-plugins/systems/admin/systems/system-list.xml
@@ -7,16 +7,56 @@
     <baseMode>true</baseMode>
     <multiSelect>true</multiSelect>
     <template>system-list.tpl</template>
-    <module>roles</module>
+    <module>server</module>
     <label>List of systems</label>
     <defaultSortColumn>1</defaultSortColumn>
 
     <objectType>
-      <label>Role</label>
-      <objectClass>organizationalRole</objectClass>
-      <category>roles</category>
-      <class>role</class>
-      <image>plugins/rolemanagement/images/role.png</image>
+      <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>goPhoneHardware</objectClass>
+      <category>phone</category>
+      <class>phoneGeneric</class>
+      <image>plugins/systems/images/select_phone.png</image>
+    </objectType>
+
+    <objectType>
+      <label>Component</label>
+      <objectClass>ieee802Device</objectClass>
+      <category>component</category>
+      <class>componentGeneric</class>
+      <image>plugins/systems/images/select_component.png</image>
     </objectType>
 
   </definition>
@@ -68,7 +108,7 @@
      <label>Create</label>
 
      <action>
-      <name>new</name>
+      <name>new_server</name>
       <type>entry</type>
       <image>plugins/systems/images/select_server.png</image>
       <label>Server</label>
@@ -76,7 +116,7 @@
      </action>
 
      <action>
-      <name>new</name>
+      <name>new_workstation</name>
       <type>entry</type>
       <image>plugins/systems/images/select_workstation.png</image>
       <label>Workstation</label>
@@ -84,7 +124,7 @@
      </action>
 
      <action>
-      <name>new</name>
+      <name>new_terminal</name>
       <type>entry</type>
       <image>plugins/systems/images/select_terminal.png</image>
       <label>Terminal</label>
@@ -92,7 +132,7 @@
      </action>
 
      <action>
-      <name>new</name>
+      <name>new_printer</name>
       <type>entry</type>
       <image>plugins/systems/images/select_printer.png</image>
       <label>Network printer</label>
@@ -100,7 +140,7 @@
      </action>
 
      <action>
-      <name>new</name>
+      <name>new_phone</name>
       <type>entry</type>
       <image>plugins/systems/images/select_phone.png</image>
       <label>Phone</label>
@@ -108,7 +148,7 @@
      </action>
 
      <action>
-      <name>new</name>
+      <name>new_component</name>
       <type>entry</type>
       <image>plugins/systems/images/select_component.png</image>
       <label>Network device</label>
@@ -116,7 +156,7 @@
      </action>
 
      <action>
-      <name>new</name>
+      <name>new_opsi_client</name>
       <type>entry</type>
       <image>plugins/systems/images/select_winstation.png</image>
       <label>Opsi client</label>
-- 
2.30.2