diff --git a/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc b/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc
index 977da93fd5ae0179b43cc43f38030448f28caa55..4e122d898bf859c892051095fa47f56c8ae8bc56 100644 (file)
}
/* Get list of available xdrivers */
- $this->XDrivers = $this->getListOfXDrivers();
+ foreach($this->getListOfXDrivers() as $xdriver) {
+ $this->XDrivers[$xdriver] = $xdriver;
+ }
- array_unshift($this->XDrivers, "["._("unknown")."]");
-
+ if (isset($this->attrs['gosaGroupObjects'])) {
+ array_unshift($this->XDrivers, "["._("manual/auto")."]");
+ }
+ else {
+ array_unshift($this->XDrivers, "["._("unknown")."]");
+ }
+
$this->XColordepths= array(
"8" => "8 " ._("bit"),
"15" => "15 "._("bit"),
switch ($name){
case 'gotoXDriver':
- $this->XDrivers = array('default' => _("inherited").' ['.$attrs[$name][0].']' ) + $this->XDrivers;
+ $ogroup_driver = $attrs['gotoXDriver'][0];
+ if (in_array($ogroup_driver, $this->XDrivers) && (empty($this->attrs['gotoXDriver']))) {
+ $this->XDrivers = array('default' => _("inherited").' ['.$attrs[$name][0].']' ) + $this->XDrivers;
+ }
break;
case 'gotoXResolution':
$this->XResolutions= array('default' => _("inherited").' ['.$attrs[$name][0].']' ) + $this->XResolutions;