Fixed server error

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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 9ddc4de2fa621a85bb61b4b388cf3241d5fce48c..7f01cd09de8ab64edf80518a31387aa2e8181ad2 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -177,7 +177,7 @@
        <servtabs>
                <tab class="servgeneric" name="Generic" />
                <tab class="workstartup" name="Startup" />
-               <tab class="serverService" name="Services" />
+               <tab class="ServerService" name="Services" />
 {if $cv.enableFAI_management}
            <tab class="faiSummaryTab" name="FAI summary" />
 {else}

diff --git a/plugins/admin/systems/class_servDHCP.inc b/plugins/admin/systems/class_servDHCP.inc
index df62afbedceb43b0d0f35622c126fb76e3b927ab..9e0fb015709a3be3ab0a19c023b07d5262b84eac 100644 (file)
--- a/plugins/admin/systems/class_servDHCP.inc
+++ b/plugins/admin/systems/class_servDHCP.inc
@@ -314,7 +314,7 @@ class servdhcp extends goService
 
     /* Show dialog
      */
-    if($this->dialog !== NULL && !is_int($this->dialog)){
+    if($this->dialog !== NULL && !is_int($this->dialog) && is_object($this->dialog)){
       $this->dialog->save_object();
       $this->dialog->parent = $this;
       return($this->dialog->execute());

diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc
index 5d0cb04aa875e34f2fcaac06afc74ac175a87bcf..ade28ad56ba421b74f2e129e9f09cb465c4b9782 100644 (file)
--- a/plugins/admin/systems/class_systemManagement.inc
+++ b/plugins/admin/systems/class_systemManagement.inc
@@ -811,7 +811,16 @@ class systems extends plugin
       $display= $this->systab->execute();
 
       /* Don't show buttons if tab dialog requests this */
-      if ((isset($this->systab->by_object))&&(!$this->systab->by_object[$this->systab->current]->dialog)){
+
+      $dialog = FALSE;
+      if(isset($this->systab->by_object[$this->systab->current]->dialog)){
+        $dia = $this->systab->by_object[$this->systab->current]->dialog;
+        if($dia === TRUE || is_object($dia)){
+          $dialog = TRUE;
+        }  
+      }
+
+      if (!$dialog){
         $display.= "<p style=\"text-align:right\">\n";
         $display.= "<input type=\"submit\" name=\"edit_finish\" style=\"width:80px\" value=\""._("Ok")."\">\n";
         $display.= "&nbsp;\n";