Fixed objectClass detection problems between gotoDevices and network devices.

[gosa.git] / gosa-plugins / systems / admin / systems / system-list.xml

diff --git a/gosa-plugins/systems/admin/systems/system-list.xml b/gosa-plugins/systems/admin/systems/system-list.xml
index 535b84b539cea0084099a890ee7f2b18f250d2cb..1fdb07a634c0c863b8984cc108f4da9cad3909be 100644 (file)
--- a/gosa-plugins/systems/admin/systems/system-list.xml
+++ b/gosa-plugins/systems/admin/systems/system-list.xml
@@ -10,6 +10,14 @@
     <label>List of systems</label>
     <defaultSortColumn>1</defaultSortColumn>
 
+    <objectType>
+      <label>Device</label>
+      <objectClass>registeredDevice</objectClass>
+      <category>Device</category>
+      <class>Device</class>
+      <image>images/lists/edit.png</image>
+    </objectType>
+
     <objectType>
       <label>Opsi host</label>
       <objectClass>FAKE_OC_OpsiHost</objectClass>
@@ -31,7 +39,7 @@
       <objectClass>goServer__IS_LOCKED</objectClass>
       <category>server</category>
       <class>servgeneric</class>
-      <image>plugins/systems/images/server_locked.png</image>
+      <image>plugins/systems/images/select_server.png[locked]</image>
     </objectType>
 
     <objectType>
@@ -39,7 +47,7 @@
       <objectClass>gotoWorkstation__IS_LOCKED</objectClass>
       <category>workstation</category>
       <class>workgeneric</class>
-      <image>plugins/systems/images/workstation_locked.png</image>
+      <image>plugins/systems/images/select_workstation.png[locked]</image>
     </objectType>
 
     <objectType>
@@ -47,7 +55,7 @@
       <objectClass>gotoTerminal__IS_LOCKED</objectClass>
       <category>terminal</category>
       <class>termgeneric</class>
-      <image>plugins/systems/images/terminal_locked.png</image>
+      <image>plugins/systems/images/select_terminal.png[locked]</image>
     </objectType>
 
 
@@ -62,16 +70,16 @@
     <objectType>
       <label>New unknown device</label>
       <objectClass>FAKE_OC_ArpNewDevice</objectClass>
-      <category>terminal</category>
-      <class>termgeneric</class>
+      <category>incoming</category>
+      <class>ArpNewDevice</class>
       <image>images/lists/element.png[new]</image>
     </objectType>
 
     <objectType>
       <label>New device</label>
       <objectClass>FAKE_OC_NewDevice</objectClass>
-      <category>terminal</category>
-      <class>termgeneric</class>
+      <category>incoming</category>
+      <class>systemManagement</class>
       <image>images/lists/element.png[new]</image>
     </objectType>
 
@@ -92,7 +100,7 @@
     </objectType>
 
     <objectType>
-      <label>Winstation</label>
+      <label>Windows workstation</label>
       <objectClass>FAKE_OC_winstation</objectClass>
       <category>winworkstation</category>
       <class>wingeneric</class>
@@ -127,7 +135,7 @@
       <label>Printer</label>
       <objectClass>gotoPrinter</objectClass>
       <category>printer</category>
-      <class>printGeneric</class>
+      <class>printgeneric</class>
       <image>plugins/systems/images/select_printer.png</image>
     </objectType>
 
@@ -169,7 +177,7 @@
       <label>Name</label>
       <sortAttribute>cn</sortAttribute>
       <sortType>string</sortType>
-      <value>%{filter:link(row,dn,"%s",cn)}</value>
+      <value>%{filter:filterLink(row,dn,"%s",cn,pid)}</value>
       <export>true</export>
     </column>
 
@@ -177,7 +185,7 @@
       <label>Description</label>
       <sortAttribute>description</sortAttribute>
       <sortType>string</sortType>
-      <value>%{filter:link(row,dn,"%s",description)}</value>
+      <value>%{filter:filterSystemDescription(row,dn,pid,state,description)}</value>
       <export>true</export>
     </column>
 
@@ -203,6 +211,14 @@
      <image>images/lists/element.png[new]</image>
      <label>Create</label>
 
+     <action>
+      <name>new_device</name>
+      <type>entry</type>
+      <image>images/lists/edit.png</image>
+      <label>Device</label>
+      <depends>Device</depends>
+     </action>
+
      <action>
       <name>new_goServer</name>
       <type>entry</type>