X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_workstationService.inc;h=b8dbddd00100bd4cbbd267921cd93eebab24d785;hb=b8358a5412b082ef08c36c441a85a4a651d84f7a;hp=e7ec6c77d6cf67132200aae667c26462d69a1397;hpb=cda8fd1464f8339a552784d1749a699ed8f6207f;p=gosa.git

diff --git a/plugins/admin/systems/class_workstationService.inc b/plugins/admin/systems/class_workstationService.inc
index e7ec6c77d..b8dbddd00 100644
--- a/plugins/admin/systems/class_workstationService.inc
+++ b/plugins/admin/systems/class_workstationService.inc
@@ -58,9 +58,9 @@ class workservice extends plugin
   var $XKbLayouts       =array();
   var $XKbVariants      =array();
 
-  function workservice ($config, $dn= NULL)
+  function workservice ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
 
     $this->XResolutions= array( 
         "640x480"   =>  "640x480",
@@ -223,6 +223,17 @@ class workservice extends plugin
       }
 
     }
+
+    /* Workaround to fill in inherited values if we've specified an objectclass */
+    if (isset($_SESSION['SelectedSystemType']['ogroup']) && $_SESSION['SelectedSystemType']['ogroup'] != 'none'){
+      $this->XResolutions= array('default' => _("inherited"));
+      $this->XColordepths= array('default' => _("inherited"));
+      $this->XKbModels= array('default' => _("inherited"));
+      $this->XKbLayouts= array('default' => _("inherited"));
+      $this->XKbVariants= array('default' => _("inherited"));
+      $this->MouseTypes= array('AUTO' => _("inherited"));
+      $this->MousePorts= array('AUTO' => _("inherited"));
+    }
   }
 
   function execute()