Updated system listing

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

diff --git a/gosa-plugins/systems/admin/systems/class_systemManagement.inc b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
index fc84b6a96b0e16e1166091e1b38284d8f279b99a..84f4c71215fcc2f088952df77b094787d85c51e6 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_systemManagement.inc
+++ b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
@@ -119,7 +119,7 @@ class systemManagement extends management
         $this->registerAction("systemTypeChosen","systemTypeChosen");
         $this->registerAction("handleActivationQueue","handleActivationQueue");
 
-        $this->registerAction("new_registeredDevice", "newEntry");
+        $this->registerAction("new_Device",           "newEntry");
         $this->registerAction("new_goServer",         "newEntry");
         $this->registerAction("new_gotoWorkstation",  "newEntry");
         $this->registerAction("new_gotoTerminal",     "newEntry");
@@ -1273,14 +1273,14 @@ class systemManagement extends management
     public function getObjectDefinitions()
     {
         $tabs = array(
-                "registeredDevice" => array(
+                "device" => array(
                     "ou"          => "ou=systems,",
-                    "plugClass"   => "registeredDevice",
-                    "tabClass"    => "registeredDeviceTab",
-                    "tabDesc"     => "REGISTEREDDEVICETABS",
-                    "aclClass"    => "registeredDevice",
+                    "plugClass"   => "Device",
+                    "tabClass"    => "DeviceTab",
+                    "tabDesc"     => "NEWDEVICETABS",
+                    "aclClass"    => "Device",
                     "sendEvents"  => FALSE,
-                    "aclCategory" => "registeredDevice"),
+                    "aclCategory" => "device"),
 
                 "FAKE_OC_OpsiHost" => array(
                     "ou"          => "",

diff --git a/gosa-plugins/systems/admin/systems/system-filter.xml b/gosa-plugins/systems/admin/systems/system-filter.xml
index b43d8565a1be257bb01038c2f5472dd17d59c3ef..2ad58ebac53010852016d1d7bcdd562f29b7862e 100644 (file)
--- a/gosa-plugins/systems/admin/systems/system-filter.xml
+++ b/gosa-plugins/systems/admin/systems/system-filter.xml
@@ -12,7 +12,7 @@
     <category>printer</category>
     <category>winworkstation</category>
     <category>component</category>
-    <category>registeredDevice</category>
+    <category>Device</category>
     <scope>auto</scope>
     <default>default</default>
     <attribute>dn</attribute>
@@ -35,7 +35,7 @@
       <filter>(&amp;
                 (|(objectClass=goServer)
                   (objectClass=gotoWorkstation)
-                  (objectClass=registeredDevice)
+                  (objectClass=device)
                   (objectClass=gotoTerminal)
                   (objectClass=goFonHardware)
                   (objectClass=ieee802Device)

diff --git a/gosa-plugins/systems/admin/systems/system-list.xml b/gosa-plugins/systems/admin/systems/system-list.xml
index 7946d5b72bf030e0af4394a1186ba7e21d9206cc..7607a30cba7f819de12bd225657c402d362e9cb0 100644 (file)
--- a/gosa-plugins/systems/admin/systems/system-list.xml
+++ b/gosa-plugins/systems/admin/systems/system-list.xml
@@ -11,10 +11,10 @@
     <defaultSortColumn>1</defaultSortColumn>
 
     <objectType>
-      <label>Registered device</label>
-      <objectClass>registeredDevice</objectClass>
-      <category>registeredDevice</category>
-      <class>registeredDevice</class>
+      <label>Device</label>
+      <objectClass>device</objectClass>
+      <category>Device</category>
+      <class>Device</class>
       <image>images/lists/edit.png</image>
     </objectType>
 
@@ -212,11 +212,11 @@
      <label>Create</label>
 
      <action>
-      <name>new_registeredDevice</name>
+      <name>new_Device</name>
       <type>entry</type>
       <image>images/lists/edit.png</image>
-      <label>Registered device</label>
-      <depends>registeredDevice</depends>
+      <label>Device</label>
+      <depends>Device</depends>
      </action>
 
      <action>