summaryrefslogtreecommitdiff
path: root/framework/Web
diff options
context:
space:
mode:
authorxue <>2006-12-07 15:45:58 +0000
committerxue <>2006-12-07 15:45:58 +0000
commit8cd6c808c372c31e1276a9146243de0a627f2dcd (patch)
treeb6b57e86a13efe0b2b75408ad2ad054434c83415 /framework/Web
parent35bd39861f2f8e2ba83550f9a45e9ef7a9b9d6e5 (diff)
Fixed #481.
Diffstat (limited to 'framework/Web')
-rw-r--r--framework/Web/UI/WebControls/TWizard.php17
1 files changed, 12 insertions, 5 deletions
diff --git a/framework/Web/UI/WebControls/TWizard.php b/framework/Web/UI/WebControls/TWizard.php
index 002c49a8..9f959eaa 100644
--- a/framework/Web/UI/WebControls/TWizard.php
+++ b/framework/Web/UI/WebControls/TWizard.php
@@ -173,6 +173,10 @@ class TWizard extends TWebControl implements INamingContainer
* @var TDataList side bar data list.
*/
private $_sideBarDataList;
+ /**
+ * @var boolean whether navigation should be cancelled (a status set in OnSideBarButtonClick)
+ */
+ private $_cancelNavigation=false;
/**
* @return string tag name for the wizard
@@ -675,7 +679,7 @@ class TWizard extends TWebControl implements INamingContainer
* Raises <b>OnCompleteButtonClick</b> event.
* This event is raised when a finish navigation button is clicked in the
* current active step.
- * @param TEventParameter event parameter
+ * @param TWizardNavigationEventParameter event parameter
*/
public function onCompleteButtonClick($param)
{
@@ -688,7 +692,7 @@ class TWizard extends TWebControl implements INamingContainer
* Raises <b>OnNextButtonClick</b> event.
* This event is raised when a next navigation button is clicked in the
* current active step.
- * @param TEventParameter event parameter
+ * @param TWizardNavigationEventParameter event parameter
*/
public function onNextButtonClick($param)
{
@@ -699,7 +703,7 @@ class TWizard extends TWebControl implements INamingContainer
* Raises <b>OnPreviousButtonClick</b> event.
* This event is raised when a previous navigation button is clicked in the
* current active step.
- * @param TEventParameter event parameter
+ * @param TWizardNavigationEventParameter event parameter
*/
public function onPreviousButtonClick($param)
{
@@ -709,7 +713,7 @@ class TWizard extends TWebControl implements INamingContainer
/**
* Raises <b>OnSideBarButtonClick</b> event.
* This event is raised when a link button in the side bar is clicked.
- * @param TEventParameter event parameter
+ * @param TWizardNavigationEventParameter event parameter
*/
public function onSideBarButtonClick($param)
{
@@ -1137,7 +1141,8 @@ class TWizard extends TWebControl implements INamingContainer
$this->_activeStepIndexSet=false;
$this->onSideBarButtonClick($navParam);
- if(!$navParam->getCancelNavigation())
+ $this->_cancelNavigation=$navParam->getCancelNavigation();
+ if(!$this->_cancelNavigation)
{
if(!$this->_activeStepIndexSet && $this->allowNavigationToStep($newStepIndex))
$this->setActiveStepIndex($newStepIndex);
@@ -1385,6 +1390,8 @@ class TWizard extends TWebControl implements INamingContainer
}
else if(strcasecmp($command,self::CMD_MOVETO)===0)
{
+ if($this->_cancelNavigation) // may be set in onSideBarButtonClick
+ $navParam->setCancelNavigation(true);
$navParam->setNextStepIndex(TPropertyValue::ensureInteger($param->getCommandParameter()));
$handled=true;
}