Fixe

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

diff --git a/gosa-plugins/systems/admin/systems/class_termDNS.inc b/gosa-plugins/systems/admin/systems/class_termDNS.inc
index 35ec21d23ebe5300155374f705af98abf792b8ac..afaa4349ff419c97e5fb4a4ceb51015cfebed442 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_termDNS.inc
+++ b/gosa-plugins/systems/admin/systems/class_termDNS.inc
@@ -722,7 +722,7 @@ class termDNS extends plugin
     if($this->dhcpEnabled && $this->acl_is_writeable("dhcpSetup")) {
 
       if(count($this->dhcpHostEntry) == 0){
-        $this->dialog = new dhcpHost($parent,$this->dhcpParentNode,TRUE);
+        $this->dialog = new dhcpHost($this->parent,$this->dhcpParentNode,TRUE);
         $this->dialog->cn = $this->cn;
         $this->dialog->dhcpHWAddress = "ethernet ".$this->macAddress;
         if(!empty($this->ipHostNumber)){

diff --git a/gosa-plugins/systems/admin/systems/services/class_goService.inc b/gosa-plugins/systems/admin/systems/services/class_goService.inc
index 2651b3693394bee256a50f5e675627ca8d4fb061..f02f7cc9797215cfa96b0f76f3f0720eaba36ea7 100644 (file)
--- a/gosa-plugins/systems/admin/systems/services/class_goService.inc
+++ b/gosa-plugins/systems/admin/systems/services/class_goService.inc
@@ -79,9 +79,10 @@ class goService extends plugin{
     $fields['Message']      = _("Empty service");
 
     /* Allow/disallow some functions */
-    $fields['AllowStart']   = $this->acl_is_writeable("start");
-    $fields['AllowStop']    = $this->acl_is_writeable("stop");
-    $fields['AllowRestart'] = $this->acl_is_writeable("restart");
+    $sf = !empty($this->StatusFlag);
+    $fields['AllowStart']   = $sf && $this->acl_is_writeable("start");
+    $fields['AllowStop']    = $sf && $this->acl_is_writeable("stop");
+    $fields['AllowRestart'] = $sf && $this->acl_is_writeable("restart");
     $fields['AllowRemove']  = $this->acl_is_removeable();
     $fields['AllowEdit']    = $this->acl_is_readable("");
     return($fields);