Changeset 2427

Timestamp:

04/17/2008 12:18:25 PM (8 months ago)

Author:

tof

Message:

Implemented #745

Location:

trunk

Files:

• HISTORY (modified) (1 diff)
• framework/Web/UI/WebControls/TWizard.php (modified) (1 diff)
• tests/FunctionalTests/tickets/protected/pages/Ticket745.page (added)
• tests/FunctionalTests/tickets/protected/pages/Ticket745.php (added)
• tests/FunctionalTests/tickets/tests/Ticket745TestCase.php (added)

trunk/HISTORY

@@ -36 +36 @@
 ENH: Ticket#741 - Added CDbConnection.currentTransaction property (Qiang)
 ENH: Ticket#743 - Added status code header in HTTP response when in error (Qiang)
+ENH: Ticket#745 - TWizard action MoveTo - allow specify step ID's (Christophe)
 ENH: Ticket#757 - TDateFormat and TNumberFormat now implement IDataRenderer (Qiang)
 ENH: Ticket#783 - Added date/time type support to soap implementation (Hongliang)

trunk/framework/Web/UI/WebControls/TWizard.php

@@ -1393 +1393 @@
                                 if($this->_cancelNavigation)  // may be set in onSideBarButtonClick
                                         $navParam->setCancelNavigation(true);
-                                $navParam->setNextStepIndex(TPropertyValue::ensureInteger($param->getCommandParameter()));
+                                $requestedStep=$param->getCommandParameter();
+                                if (!is_numeric($requestedStep))
+                                {
+                                        $requestedIndex=-1;
+                                        foreach ($this->getWizardSteps() as $index=>$step)
+                                                if ($step->getId()===$requestedStep)
+                                                {
+                                                        $requestedIndex=$index;
+                                                        break;
+                                                }
+                                        if ($requestedIndex<0)
+                                                throw new TConfigurationException('wizard_step_invalid');
+                                }
+                                else
+                                        $requestedIndex=TPropertyValue::ensureInteger($requestedStep);
+                                $navParam->setNextStepIndex($requestedIndex);
                                 $handled=true;
                         }