From 39902196535169338681dd58ff01b9c893295a9b Mon Sep 17 00:00:00 2001 From: psc Date: Thu, 20 May 2010 08:31:16 +0000 Subject: [PATCH] Apply patch from mba for #4146 - Never set InheritXYSync for new objects - Never disable display properties in object groups git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@18566 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../goto/admin/systems/goto/class_workstationService.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 f42eb7dbd..bf30f119f 100644 --- a/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc +++ b/trunk/gosa-plugins/goto/admin/systems/goto/class_workstationService.inc @@ -192,6 +192,10 @@ class workservice extends plugin if(!empty($this->attrs['gotoXHsync'][0]) && !empty($this->attrs['gotoXVsync'][0])) { $this->InheritXYSync = FALSE; } + } else { + if($this->dn == "new") { + $this->InheritXYSync = FALSE; + } } /* Workaround to fill in inherited values if we've specified an objectclass */ @@ -325,7 +329,7 @@ class workservice extends plugin $smarty->assign("AutoSyncCHK"," "); $smarty->assign("hiddenState",""); } - if($this->InheritXYSync) { + if($this->InheritXYSync && !isset($this->parent->by_object['ogroup'])) { $smarty->assign("InheritXYSync", " checked "); $smarty->assign("hiddenState", " disabled "); $smarty->assign("AutoSynchiddenState", " disabled "); -- 2.30.2