From 5c0961ea9eaa3c93798ce9d9fdd1daef704f362e Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 17 Mar 2006 11:09:55 +0000 Subject: [PATCH] Fixed problem with different dialog types git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2858 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/systems/class_printGeneric.inc | 21 ++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc index 6870431ba..9fe4453df 100644 --- a/plugins/admin/systems/class_printGeneric.inc +++ b/plugins/admin/systems/class_printGeneric.inc @@ -39,6 +39,7 @@ class printgeneric extends plugin var $dialog =NULL; var $netConfigDNS; + var $baseSelection = false; /* attribute list for save action */ var $attributes = array("cn", "description", "l", "labeledURI", "gotoPrinterPPD","gotoUserPrinter"); @@ -253,6 +254,7 @@ class printgeneric extends plugin $once = false; $this->dialog = new baseSelectDialog($this->config); $this->dialog->setCurrentBase($this->base); + $this->baseSelection = true; } } @@ -260,14 +262,17 @@ class printgeneric extends plugin if(is_object($this->dialog)){ /* Must be called before save_object */ $this->dialog->save_object(); - - if($this->dialog->isClosed()){ - $this->dialog = false; - }elseif($this->dialog->isSelected()){ - $this->base = $this->dialog->isSelected(); - $this->dialog= false; - }else{ - return($this->dialog->execute()); + if($this->baseSelection){ + if($this->dialog->isClosed()){ + $this->dialog = false; + $this->baseSelection = false; + }elseif($this->dialog->isSelected()){ + $this->base = $this->dialog->isSelected(); + $this->dialog= false; + $this->baseSelection = false; + }else{ + return($this->dialog->execute()); + } } } -- 2.30.2