From a14913019919d7b6c2d13769b151a645b5226e02 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Thu, 4 May 2006 02:36:22 +0000
Subject: Fixed an issue about instantiating a template: direct child controls
 are added to page hierarchy at the last.

---
 framework/Web/UI/WebControls/TWizard.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'framework/Web/UI/WebControls/TWizard.php')

diff --git a/framework/Web/UI/WebControls/TWizard.php b/framework/Web/UI/WebControls/TWizard.php
index 3af09a95..fb0c941d 100644
--- a/framework/Web/UI/WebControls/TWizard.php
+++ b/framework/Web/UI/WebControls/TWizard.php
@@ -894,8 +894,13 @@ class TWizard extends TWebControl implements INamingContainer
 		$activeStep=$this->getActiveStep();
 		$activeStepIndex=$this->getActiveStepIndex();
 
-		if(!$this->_navigation || $activeStepIndex<0 || $activeStepIndex>=$wizardSteps->getCount())
+		if(!$this->_navigation)
 			return;
+		else if($activeStepIndex<0 || $activeStepIndex>=$wizardSteps->getCount())
+		{
+			$this->_navigation->setVisible(false);
+			return;
+		}
 
 		// set visibility of different types of navigation panel
 		$showStandard=true;
@@ -1184,7 +1189,8 @@ class TWizard extends TWebControl implements INamingContainer
 		$this->_stepContent=new TPanel;
 		$this->_stepContent->getControls()->add($multiView);
 		$this->getControls()->add($this->_stepContent);
-		$multiView->setActiveViewIndex(0);
+		if($multiView->getViews()->getCount())
+			$multiView->setActiveViewIndex(0);
 	}
 
 	/**
-- 
cgit v1.2.3