From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 15 Sep 2011 09:04:00 +0000 (+0000)
Subject: Backports from trunk
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=69f6c8c4e30b708d3ca6a44c1ddd82952f32c89a;p=gosa.git

Backports from trunk
-Updated the service listing for servers, it uses a filter which checks no acls anymore.
-Fixed error in class_systemManagement.inc when a not available object type was edited.


git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.7@21002 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 39835f227..3c2b052f4 100644
--- a/gosa-plugins/systems/admin/systems/class_systemManagement.inc
+++ b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
@@ -661,7 +661,7 @@ class systemManagement extends management
                     // Delete the object
                     $this->dn = $dn;
                     if($info['tabClass'] == "phonetabs"){
-                        $this->tabObject= new $tabtype($this->config, $this->config->data['TABS'][$tabobj], $dn,$type);
+                        $this->tabObject= new $info['tabClass']($this->config, $this->config->data['TABS'][$info['tabDesc']], $dn,$type);
                         $this->tabObject->set_acl_base($dn);
                         $this->tabObject->by_object['phoneGeneric']->remove_from_parent ();
                     }else{
@@ -701,6 +701,12 @@ class systemManagement extends management
             $headpage = $this->getHeadpage();
             $dn = $target[0];
             $type =$headpage->getType($dn);
+
+            if(!isset($tInfo[$type])){
+                msg_dialog::display(_("Information"),sprintf(_("The object-type '%s' cannot be managed with your setup of GOsa, please install the required  plugins!"), $type), ERROR_DIALOG);
+                return;
+            }
+
             $tData = $tInfo[$type];
 
             if($type == "FAKE_OC_ArpNewDevice"){
@@ -1274,7 +1280,7 @@ class systemManagement extends management
     {
         $tabs = array(
                 "device" => array(
-                    "ou"          => get_ou('Device','DeviceRDN'),
+                    "ou"          => get_ou('Device','GOsaDeviceRDN'),
                     "plugClass"   => "Device",
                     "tabClass"    => "DeviceTab",
                     "tabDesc"     => "NEWDEVICETABS",
diff --git a/gosa-plugins/systems/admin/systems/serverService-list.xml b/gosa-plugins/systems/admin/systems/serverService-list.xml
index 8ee8fd581..fba991ec3 100644
--- a/gosa-plugins/systems/admin/systems/serverService-list.xml
+++ b/gosa-plugins/systems/admin/systems/serverService-list.xml
@@ -8,6 +8,7 @@
     <template>serverService-list.tpl</template>
     <label>List of services</label>
     <defaultSortColumn>1</defaultSortColumn>
+    <noAclChecks>true</noAclChecks>
 
     <objectType>
       <label>Service</label>