Skip to content
Browse files

Merge pull request #161 from thunderwolf/master

Problem with admin generator additiona action and sfPropelORMRouteCollection (with corrected pull)
  • Loading branch information...
2 parents ed8361b + 065f51e commit 686237b2658c13d23ab851d8e06fe8457b76001b @willdurand willdurand committed
Showing with 2 additions and 1 deletion.
  1. +1 −0 .gitignore
  2. +1 −1 lib/routing/sfPropelORMRouteCollection.class.php
View
1 .gitignore
@@ -5,3 +5,4 @@ test/functional/fixtures/lib/model/map/
test/functional/fixtures/lib/model/om/
mockproject/
junit.xml
+.svn
View
2 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'])
);
}

0 comments on commit 686237b

Please sign in to comment.
Something went wrong with that request. Please try again.