[Tickets #6917] upstream Routes merge

[bugs at horde.org]

DO NOT REPLY TO THIS MESSAGE. THIS EMAIL ADDRESS IS NOT MONITORED.

Ticket URL: http://bugs.horde.org/ticket/6917
-----------------------------------------------------------------------
  Ticket             | 6917
  Created By         | Chuck Hagenbuch <chuck at horde.org>
  Summary            | upstream Routes merge
  Queue              | Horde Framework Packages
  Version            | HEAD
  Type               | Enhancement
  State              | Assigned
  Priority           | 1. Low
  Milestone          |
  Patch              |
  Owners             | Mike Naberezny
-----------------------------------------------------------------------


Chuck Hagenbuch <chuck at horde.org> (2008-06-13 11:39) wrote:

Revision
     71
Author
     mnaberez
Date
     2008-06-12 23:38:04 -0400 (Thu, 12 Jun 2008)

Log Message

Also generate formatted route for PUT and DELETE.  This needs a test  
and to be merged upstream to both Pylons Routes and Horde_Routes.

Modified Paths

     * trunk/vendor/Horde/Routes/Mapper.php

Diff
Modified: trunk/vendor/Horde/Routes/Mapper.php (70 => 71)


--- trunk/vendor/Horde/Routes/Mapper.php	2008-06-13 03:37:12 UTC (rev 70)
+++ trunk/vendor/Horde/Routes/Mapper.php	2008-06-13 03:38:04 UTC (rev 71)
@@ -874,6 +874,7 @@
                  $this->connect($routeName,
                                 sprintf("%s/%s", $collectionPath, $action),
                                 $routeOptions);
+
                  $this->connect('formatted_' . $routeName,
                                 sprintf("%s/%s.:(format)",  
$collectionPath, $action),
                                 $routeOptions);
@@ -893,8 +894,6 @@
                         $collectionPath,
                         array_merge($connectkargs, $options));

-        $connectkargs = array('action' => 'index',
-                              'conditions' => array('method' =>  
array('GET')));
          $this->connect('formatted_' . $kargs['namePrefix'] . $collectionName,
                         $collectionPath . '.:(format)',
                         array_merge($connectkargs, $options));
@@ -953,6 +952,7 @@
              if ($primary) {
                  $routeOptions['action'] = $primary;
                  $this->connect($memberPath, $routeOptions);
+                $this->connect($memberPath . '.:(format)', $routeOptions);
              }
          }