Fixed an issue about instantiating a template: direct child controls are added to page hierarchy at the last.

1 files changed, 8 insertions, 2 deletions

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);

 	}

 

 	/**