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 7bc9356094ad236f11b50cfc0c771da9e0b22805..1fdb07a634c0c863b8984cc108f4da9cad3909be 100644 (file)
--- a/gosa-plugins/systems/admin/systems/system-list.xml
+++ b/gosa-plugins/systems/admin/systems/system-list.xml
@@ -7,10 +7,17 @@
     <baseMode>true</baseMode>
     <multiSelect>true</multiSelect>
     <template>system-list.tpl</template>
-    <module>server</module>
     <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>
@@ -24,7 +31,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>
@@ -32,23 +39,23 @@
       <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>
       <label>Locked workstation</label>
-      <objectClass>gotoWorkstation</objectClass>
+      <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>
       <label>Locked terminal</label>
-      <objectClass>gotoTerminal</objectClass>
+      <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>
 
 
@@ -57,23 +64,23 @@
       <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>
       <label>New unknown device</label>
-      <objectClass>FAKE_OC_NewUnknownDevice</objectClass>
-      <category>terminal</category>
-      <class>termgeneric</class>
-      <image>plugins/systems/images/select_newsystem.png</image>
+      <objectClass>FAKE_OC_ArpNewDevice</objectClass>
+      <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>
-      <image>plugins/systems/images/select_newsystem.png</image>
+      <category>incoming</category>
+      <class>systemManagement</class>
+      <image>images/lists/element.png[new]</image>
     </objectType>
 
     <objectType>
@@ -93,7 +100,7 @@
     </objectType>
 
     <objectType>
-      <label>Winstation</label>
+      <label>Windows workstation</label>
       <objectClass>FAKE_OC_winstation</objectClass>
       <category>winworkstation</category>
       <class>wingeneric</class>
@@ -128,13 +135,13 @@
       <label>Printer</label>
       <objectClass>gotoPrinter</objectClass>
       <category>printer</category>
-      <class>printGeneric</class>
+      <class>printgeneric</class>
       <image>plugins/systems/images/select_printer.png</image>
     </objectType>
 
     <objectType>
       <label>Phone</label>
-      <objectClass>goPhoneHardware</objectClass>
+      <objectClass>goFonHardware</objectClass>
       <category>phone</category>
       <class>phoneGeneric</class>
       <image>plugins/systems/images/select_phone.png</image>
@@ -151,7 +158,7 @@
   </definition>
 
   <table>
-    <layout>|20px;c||250px|170px;r|</layout>
+    <layout>|20px;c|||80px|170px;r|</layout>
 
     <department>
       <value>%{filter:objectType(dn,objectClass)}</value>
@@ -170,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>
 
@@ -178,7 +185,15 @@
       <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>
+
+    <column>
+      <label>Release</label>
+      <sortAttribute>description</sortAttribute>
+      <sortType>string</sortType>
+      <value>%{filter:systemRelease(row,dn,"%s",objectClass,FAIclass)}</value>
       <export>true</export>
     </column>
 
@@ -193,61 +208,69 @@
 
     <action>
      <type>sub</type>
-     <image>images/lists/new.png</image>
+     <image>images/lists/element.png[new]</image>
      <label>Create</label>
 
      <action>
-      <name>new_server</name>
+      <name>new_device</name>
       <type>entry</type>
-      <image>plugins/systems/images/select_server.png</image>
+      <image>images/lists/edit.png</image>
+      <label>Device</label>
+      <depends>Device</depends>
+     </action>
+
+     <action>
+      <name>new_goServer</name>
+      <type>entry</type>
+      <image>plugins/systems/images/select_server.png[new]</image>
       <label>Server</label>
       <depends>servgeneric</depends>
      </action>
 
      <action>
-      <name>new_workstation</name>
+      <name>new_gotoWorkstation</name>
       <type>entry</type>
-      <image>plugins/systems/images/select_workstation.png</image>
+      <image>plugins/systems/images/select_workstation.png[new]</image>
       <label>Workstation</label>
       <depends>workgeneric</depends>
      </action>
 
      <action>
-      <name>new_terminal</name>
+      <name>new_gotoTerminal</name>
       <type>entry</type>
-      <image>plugins/systems/images/select_terminal.png</image>
+      <image>plugins/systems/images/select_terminal.png[new]</image>
       <label>Terminal</label>
       <depends>termgeneric</depends>
      </action>
 
      <action>
-      <name>new_printer</name>
+      <name>new_gotoPrinter</name>
       <type>entry</type>
-      <image>plugins/systems/images/select_printer.png</image>
+      <image>plugins/systems/images/select_printer.png[new]</image>
       <label>Network printer</label>
       <depends>printgeneric</depends>
      </action>
 
      <action>
-      <name>new_phone</name>
+      <name>new_goFonHardware</name>
       <type>entry</type>
-      <image>plugins/systems/images/select_phone.png</image>
+      <image>plugins/systems/images/select_phone.png[new]</image>
       <label>Phone</label>
       <depends>phoneGeneric</depends>
      </action>
 
      <action>
-      <name>new_component</name>
+      <name>new_ieee802Device</name>
       <type>entry</type>
-      <image>plugins/systems/images/select_component.png</image>
+      <image>plugins/systems/images/select_component.png[new]</image>
       <label>Network device</label>
       <depends>componentGeneric</depends>
      </action>
 
      <action>
-      <name>new_opsi_client</name>
+      <name>new_FAKE_OC_OpsiHost</name>
       <type>entry</type>
-      <image>plugins/systems/images/select_winstation.png</image>
+      <image>plugins/systems/images/select_winstation.png[new]</image>
       <label>Opsi client</label>
       <depends>opsi</depends>
      </action>
@@ -263,7 +286,7 @@
      <label>Trigger action</label>
 
       <action>
-        <name>DaemonEvent_halt</name>
+        <name>T_DaemonEvent_halt</name>
         <depends>DaemonEvent_halt</depends>
         <type>entry</type>
         <image>images/lists/reload.png</image>
@@ -271,7 +294,7 @@
       </action>
 
       <action>
-        <name>DaemonEvent_reboot</name>
+        <name>T_DaemonEvent_reboot</name>
         <depends>DaemonEvent_reboot</depends>
         <type>entry</type>
         <image>images/lists/reload.png</image>
@@ -279,7 +302,7 @@
       </action>
 
       <action>
-        <name>DaemonEvent_wakeup</name>
+        <name>T_DaemonEvent_wakeup</name>
         <depends>DaemonEvent_wakeup</depends>
         <type>entry</type>
         <image>images/lists/on.png</image>
@@ -287,7 +310,7 @@
       </action>
 
       <action>
-        <name>DaemonEvent_update</name>
+        <name>T_DaemonEvent_update</name>
         <depends>DaemonEvent_update</depends>
         <type>entry</type>
         <image>plugins/goto/images/update.png</image>
@@ -295,7 +318,7 @@
       </action>
 
       <action>
-        <name>DaemonEvent_lock</name>
+        <name>T_DaemonEvent_lock</name>
         <depends>DaemonEvent_lock</depends>
         <type>entry</type>
         <image>images/lists/locked.png</image>
@@ -303,7 +326,7 @@
       </action>
 
       <action>
-        <name>DaemonEvent_activate</name>
+        <name>T_DaemonEvent_activate</name>
         <depends>DaemonEvent_activate</depends>
         <type>entry</type>
         <image>images/lists/unlocked.png</image>
@@ -311,7 +334,7 @@
       </action>
 
       <action>
-        <name>DaemonEvent_reinstall</name>
+        <name>T_DaemonEvent_reinstall</name>
         <depends>DaemonEvent_reinstall</depends>
         <type>entry</type>
         <image>plugins/goto/images/reinstall.png</image>
@@ -329,7 +352,7 @@
      <label>Schedule action</label>
 
       <action>
-        <name>DaemonEvent_halt</name>
+        <name>S_DaemonEvent_halt</name>
         <depends>DaemonEvent_halt</depends>
         <type>entry</type>
         <image>images/lists/off.png</image>
@@ -337,7 +360,7 @@
       </action>
 
       <action>
-        <name>DaemonEvent_reboot</name>
+        <name>S_DaemonEvent_reboot</name>
         <depends>DaemonEvent_reboot</depends>
         <type>entry</type>
         <image>images/lists/reload.png</image>
@@ -345,7 +368,7 @@
       </action>
 
       <action>
-        <name>DaemonEvent_wakeup</name>
+        <name>S_DaemonEvent_wakeup</name>
         <depends>DaemonEvent_wakeup</depends>
         <type>entry</type>
         <image>images/lists/on.png</image>
@@ -353,7 +376,7 @@
       </action>
 
       <action>
-        <name>DaemonEvent_update</name>
+        <name>S_DaemonEvent_update</name>
         <depends>DaemonEvent_update</depends>
         <type>entry</type>
         <image>plugins/goto/images/update.png</image>
@@ -361,7 +384,7 @@
       </action>
 
       <action>
-        <name>DaemonEvent_lock</name>
+        <name>S_DaemonEvent_lock</name>
         <depends>DaemonEvent_lock</depends>
         <type>entry</type>
         <image>images/lists/locked.png</image>
@@ -369,7 +392,7 @@
       </action>
 
       <action>
-        <name>DaemonEvent_activate</name>
+        <name>S_DaemonEvent_activate</name>
         <depends>DaemonEvent_activate</depends>
         <type>entry</type>
         <image>images/lists/unlocked.png</image>
@@ -377,7 +400,7 @@
       </action>
 
       <action>
-        <name>DaemonEvent_reinstall</name>
+        <name>S_DaemonEvent_reinstall</name>
         <depends>DaemonEvent_reinstall</depends>
         <type>entry</type>
         <image>plugins/goto/images/reinstall.png</image>
@@ -391,7 +414,7 @@
     </action>
 
     <action>
-      <name>activate_systems</name>
+      <name>activateMultiple</name>
       <depends>DaemonEvent_activate</depends>
       <type>entry</type>
       <image>images/lists/unlocked.png</image>
@@ -425,6 +448,25 @@
 
   <actiontriggers snapshot="true" copypaste="true">
 
+    <action>
+      <name>setPassword</name>
+      <type>entry</type>
+      <objectclass>FAKE_OC_PWD_changeAble</objectclass>
+      <image>images/lists/key.png</image>
+      <label>Change password</label>
+    </action>
+
+
+    <action>
+      <name>createISO</name>
+      <type>entry</type>
+      <objectclass>gotoWorkstation</objectclass>
+      <objectclass>FAIobject</objectclass>
+      <image>plugins/systems/images/cdrom.png</image>
+      <acl>workstation/workgeneric[createFAICD:w]</acl>
+      <label>Create ISO</label>
+    </action>
+
     <action>
       <name>cp</name>
       <type>copypaste</type>
@@ -446,8 +488,8 @@
       <name>remove</name>
       <type>entry</type>
       <image>images/lists/trash.png</image>
-      <acl>roles/role[d]</acl>
-      <label>Remove role</label>
+      <acl>%acl[d]</acl>
+      <label>Remove system</label>
     </action>
 
   </actiontriggers>