Only display unused NTP server, added gotoWorkstationTemplate to servGeneric to be...

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

diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc
index 237919660514b6378870c85d50992e52ae2bda42..464070e6d16569df9e062496fe6d1daf129af9ab 100644 (file)
--- a/plugins/admin/systems/class_workstationGeneric.inc
+++ b/plugins/admin/systems/class_workstationGeneric.inc
@@ -254,7 +254,14 @@ class workgeneric extends plugin
     $smarty->assign("modes", $this->modes);
     $smarty->assign("nfsservers", $this->config->data['SERVERS']['NFS']);
     $smarty->assign("syslogservers", $this->gotoSyslogServers);
-    $smarty->assign("ntpservers", $this->config->data['SERVERS']['NTP']);
+
+    $ntpser = array();
+    foreach($this->gotoNtpServers as $server){
+      if(!in_array($server,$this->gotoNtpServer)){
+        $ntpser[$server] = $server;
+      }
+    }
+    $smarty->assign("gotoNtpServers", $ntpser);
 
     /* Variables */
     foreach(array("base", "gotoMode", "gotoSyslogServer", "gotoNtpServer") as $val){

diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc
index 88e4d38c79874a6407dc76556dfed5729f732056..b049710695201c50ad46513c5f7ea6682169aebc 100644 (file)
--- a/plugins/admin/systems/class_workstationStartup.inc
+++ b/plugins/admin/systems/class_workstationStartup.inc
@@ -904,7 +904,7 @@ class workstartup extends plugin
     }elseif(isset($this->parent->by_object['workgeneric'])){
       $this->objectclasses = array("GOhard", "FAIobject");
     }elseif(isset($this->parent->by_object['servgeneric'])){
-      $this->objectclasses = array("GOhard", "FAIobject");
+      $this->objectclasses = array("GOhard", "FAIobject","gotoWorkstationTemplate");
     }else{
       print "Object Type Configuration : unknown";
       exit();