Updated systems filter

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

diff --git a/gosa-plugins/systems/admin/systems/system-filter.xml b/gosa-plugins/systems/admin/systems/system-filter.xml
index 81f39c576a4da063a72290095c3d0fde6533acea..511d0f12ca66819947e15aeda57148b2c29940b9 100644 (file)
--- a/gosa-plugins/systems/admin/systems/system-filter.xml
+++ b/gosa-plugins/systems/admin/systems/system-filter.xml
@@ -22,7 +22,18 @@
     <label>Default filter</label>
     <query>
       <backend>SYSTEMS</backend>
-      <filter>(&amp;(|(objectClass=goServer)(objectClass=goFonHardware)(objectClass=gotoWorkstation)(objectClass=gotoWorkstation)(objectClass=ieee802Device)(objectClass=gotoPrinter))(cn=$))</filter>
+      <filter>(&amp;
+                (|(objectClass=goServer)
+                  (objectClass=gotoWorkstation)
+                  (objectClass=gotoTerminal)
+                  (objectClass=goFonHardware)
+                  (objectClass=ieee802Device)
+                  (objectClass=gotoPrinter)
+                  (objectClass=sambaSamAccount)
+                )
+                (cn=$)
+              )
+      </filter>
     </query>
     <autocomplete>
       <attribute>cn</attribute>
@@ -33,10 +44,22 @@
 
   <search>
     <tag>all</tag>
-    <label>Ldap &amp; opsi</label>
+    <label>All systems</label>
     <query>
       <backend>SYSTEMS</backend>
-      <filter>(&amp;(objectClass=goServer)(objectClass=goPhoneHardware)(cn=$))</filter>
+      <filter>(&amp;
+                (|(objectClass=goServer)
+                  (objectClass=gotoWorkstation)
+                  (objectClass=gotoTerminal)
+                  (objectClass=goFonHardware)
+                  (objectClass=ieee802Device)
+                  (objectClass=gotoPrinter)
+                  (objectClass=sambaSamAccount)
+                  (&amp;(objectClass=goHard)(ou:dn:=%systemIncomingRDN))
+                )
+                (cn=$)
+              )
+      </filter>
     </query>
     <query>
       <backend>OPSIHOSTS</backend>
@@ -52,7 +75,7 @@
 
   <search>
     <tag>onlyOpsi</tag>
-    <label>Opsi hosts</label>
+    <label>Opsi</label>
     <query>
       <backend>OPSIHOSTS</backend>
       <filter>cn=$</filter>

diff --git a/gosa-plugins/systems/admin/systems/system-list.xml b/gosa-plugins/systems/admin/systems/system-list.xml
index e16b68d58edc7fd9d1c61b59d7e7f79906bc7c0f..506892dc46b070987f2b1bdaee924af84da68263 100644 (file)
--- a/gosa-plugins/systems/admin/systems/system-list.xml
+++ b/gosa-plugins/systems/admin/systems/system-list.xml
@@ -23,7 +23,7 @@
       <objectClass>FAKE_OC_NewWorkstation</objectClass>
       <category>workstation</category>
       <class>workgeneric</class>
-      <image>plugins/systems/images/select_new_workstation.png</image>
+      <image>plugins/systems/images/select_workstation.png[new]</image>
     </objectType>
 
     <objectType>
@@ -56,7 +56,7 @@
       <objectClass>FAKE_OC_NewTerminal</objectClass>
       <category>terminal</category>
       <class>termgeneric</class>
-      <image>plugins/systems/images/select_new_terminal.png</image>
+      <image>plugins/systems/images/select_terminal.png[new]</image>
     </objectType>
 
     <objectType>
@@ -64,7 +64,7 @@
       <objectClass>FAKE_OC_ArpNewDevice</objectClass>
       <category>terminal</category>
       <class>termgeneric</class>
-      <image>plugins/systems/images/select_newsystem.png</image>
+      <image>plugins/systems/images/select_default.png[new]</image>
     </objectType>
 
     <objectType>
@@ -72,7 +72,7 @@
       <objectClass>FAKE_OC_NewDevice</objectClass>
       <category>terminal</category>
       <class>termgeneric</class>
-      <image>plugins/systems/images/select_newsystem.png</image>
+      <image>plugins/systems/images/select_default.png[new]</image>
     </objectType>
 
     <objectType>