Fixed inheritance problem

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

diff --git a/Changelog b/Changelog
index 39e51989b85df5caa7eb54ff779f4bb25aab076a..3f5c0a4b6529e3f67a67cbf0c3f86cc67cbd4763 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -3,6 +3,9 @@ GOsa2 changelog
 * gosa 2.5.5
   - Fixed missing ppd configuration error, for newly created printer.
   - Fixed object group saving, the base was sometimes broken.
+  - Fixed saving of terminal attribute gotoLpdEnable
+  - Avoid reset of several attributes from workstations when not
+    inherited from object groups.
 
 * gosa 2.5.4
   - Included patch to choose the addressbook base

diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc
index 911fbe0318fbc0d6d6df52fec068dbb53e9dea0a..2a959b8bb1e4445e8b195f57397b6fffa4c09ef2 100644 (file)
--- a/plugins/admin/systems/class_systemManagement.inc
+++ b/plugins/admin/systems/class_systemManagement.inc
@@ -417,7 +417,7 @@ class systems extends plugin
       if (count($message) == 0){
 
         /* Save terminal data to ldap */
-        if(isset($_SESSION['SelectedSystemType']['ogroup'])){
+        if(isset($_SESSION['SelectedSystemType']['ogroup']) && $_SESSION['SelectedSystemType']['ogroup'] != 'none'){
           foreach (array("workservice", "termservice") as $cls){
             if (isset($this->systab->by_object[$cls])){
               $this->systab->by_object[$cls]->gotoXMouseport= "";