Changeset 1567 for branches/3.0

Timestamp:

12/07/2006 09:45:58 AM (2 years ago)

Author:

xue

Message:

Fixed #481.

Location:

branches/3.0

Files:

• HISTORY (modified) (1 diff)
• framework/Web/UI/WebControls/TWizard.php (modified) (7 diffs)

branches/3.0/HISTORY

@@ +1 @@
+Version 3.0.7 
+===================
+BUG: Ticket#481 - Unable to cancel navigation when handling OnSideBarButtonClickEvent (Qiang)
+
 Version 3.0.6 December 4, 2006
 ==============================

branches/3.0/framework/Web/UI/WebControls/TWizard.php

@@ -174 +174 @@
          */
         private $_sideBarDataList;
+        /**
+         * @var boolean whether navigation should be cancelled (a status set in OnSideBarButtonClick)
+         */
+        private $_cancelNavigation=false;
 
         /**
@@ -676 +680 @@
          * 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)
@@ -689 +693 @@
          * 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)
@@ -700 +704 @@
          * 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)
@@ -710 +714 @@
          * 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)
@@ -1138 +1142 @@
                         $this->_activeStepIndexSet=false;
                         $this->onSideBarButtonClick($navParam);
-                        if(!$navParam->getCancelNavigation())
+                        $this->_cancelNavigation=$navParam->getCancelNavigation();
+                        if(!$this->_cancelNavigation)
                         {
                                 if(!$this->_activeStepIndexSet && $this->allowNavigationToStep($newStepIndex))
@@ -1386 +1391 @@
                         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;