Merge pull request #161 from thunderwolf/master

Problem with admin generator additiona action and sfPropelORMRouteCollection (with corrected pull)
propelorm · Oct 4, 2012 · 686237b · 686237b
2 parents ed8361b + 065f51e
commit 686237b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ test/functional/fixtures/lib/model/map/
 test/functional/fixtures/lib/model/om/
 mockproject/
 junit.xml
+.svn
diff --git a/lib/routing/sfPropelORMRouteCollection.class.php b/lib/routing/sfPropelORMRouteCollection.class.php
@@ -103,7 +103,7 @@ protected function getWildcardRouteForCollection()
     return new $this->routeClass(
       sprintf('%s/:action/action.:sf_format', $this->options['prefix_path']),
       array_merge(array('module' => $this->options['module'], 'sf_format' => 'html'), $this->options['default_params']),
-      array_merge($this->options['requirements'], array('sf_method' => 'post')),
+      array_merge($this->options['requirements'], array('sf_method' => array('get', 'head', 'post'))),
       array('model' => $this->options['model'], 'type' => 'list', 'query_methods' => $this->options['query_methods']['list'])
     );
   }