Changeset 2534

Timestamp:

06/24/08 12:34:17 (7 months ago)

Author:

david

Message:

AgaviController::dispatch() now accepts module and action names in the request data argument, partially already implemented in [2528] for #777, but now all is fine and consistent. Still doesn't allow overwriting of module and action parameters with routing enabled, mind you. Closes #776 and #777

Location:

branches/0.11

Files:

• CHANGELOG (modified) (1 diff)
• src/controller/AgaviController.class.php (modified) (1 diff)
• src/routing/AgaviRouting.class.php (modified) (1 diff)

branches/0.11/CHANGELOG

@@ -12 +12 @@
 ADD: Allow nested routing structures with concatenated name or action attributes in ancestors other than immediate parents (Dominik) (#764)
 
+CHG: AgaviController::dispatch() should accept module and action names in the request data argument with routing disabled (#776) (David)
 CHG: Routing should not just bail out of execute() if routing is enabled, but no routes are defined (#779) (David)
 CHG: Refactor AgaviContext::initialize() and the passing of "profile" (#778) (David)

branches/0.11/src/controller/AgaviController.class.php

@@ -163 +163 @@
     try {
       
+      $rq = $this->context->getRequest();
+      $rd = $rq->getRequestData();
+      
       // match routes and assign returned initial execution container
       $container = $this->context->getRouting()->execute();
       
       // merge in any arguments given. they need to have precedence over what the routing found
-      $requestData = $this->context->getRequest()->getRequestData();
       if($arguments !== null) {
-        $requestData->merge($arguments);
+        $rd->merge($arguments);
       }
       
+      // next, we have to see if the routing did anything useful, i.e. whether or not it was enabled.
       $moduleName = $container->getModuleName();
       $actionName = $container->getActionName();
-      
-      if($moduleName == null) {
-        // no module has been specified
-        $container->setModuleName(AgaviConfig::get('actions.default_module'));
-        $container->setActionName(AgaviConfig::get('actions.default_action'));
+      if(!$moduleName) {
+        // no module has been specified; that means the routing did not run, as it would otherwise have the 404 action's module name
+        
+        // lets see if our request data has values for module and action
+        $ma = $rq->getParameter('module_accessor');
+        $aa = $rq->getParameter('action_accessor');
+        if($rd->hasParameter($ma) && $rd->hasParameter($aa)) {
+          // yup. grab those
+          $moduleName = $rd->getParameter($ma);
+          $actionName = $rd->getParameter($aa);
+        } else {
+          // nope. then its time for the default action
+          $moduleName = AgaviConfig::get('actions.default_module');
+          $actionName = AgaviConfig::get('actions.default_action');
+        }
+        
+        // so by now we hopefully have something reasonable for module and action names - let's set them on the container
+        $container->setModuleName($moduleName);
+        $container->setActionName($actionName);
       }
       

branches/0.11/src/routing/AgaviRouting.class.php

@@ -677 +677 @@
 
     if(!AgaviConfig::get('core.use_routing', false)) {
-      // routing disabled, determine module and action manually and bail out
-      $container->setModuleName($reqData->getParameter($req->getParameter('module_accessor')));
-      $container->setActionName($reqData->getParameter($req->getParameter('action_accessor')));
-
+      // routing disabled, just bail out here
       return $container;
     }