From 74cabd2604840792adbfea39da50f05f01c18810 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 20 Sep 2007 13:09:43 +0000 Subject: [PATCH] Fixed server error git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7358 594d385d-05f5-0310-b6e9-bd551577e9d8 --- contrib/gosa.conf | 2 +- plugins/admin/systems/class_servDHCP.inc | 2 +- plugins/admin/systems/class_systemManagement.inc | 11 ++++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/contrib/gosa.conf b/contrib/gosa.conf index 9ddc4de2f..7f01cd09d 100644 --- a/contrib/gosa.conf +++ b/contrib/gosa.conf @@ -177,7 +177,7 @@ - + {if $cv.enableFAI_management} {else} diff --git a/plugins/admin/systems/class_servDHCP.inc b/plugins/admin/systems/class_servDHCP.inc index df62afbed..9e0fb0157 100644 --- 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 5d0cb04aa..ade28ad56 100644 --- 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.= "

\n"; $display.= "\n"; $display.= " \n"; -- 2.30.2