diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-09-01 11:51:31 -0700 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-09-01 11:51:31 -0700 |
| commit | 5fbbf4417c1e463a3429dfe5dcef9462e4771a54 (patch) | |
| tree | 5e6d19c8f11c2a8736a2a7a6afed71c63d33ab37 /actionpack | |
| parent | c96cb8897b4afb0fea7b5fed4ec41d1772d99644 (diff) | |
| parent | 3f64fa9289a7bedb509acd319bf68c0cc0d977fb (diff) | |
| download | rails-5fbbf4417c1e463a3429dfe5dcef9462e4771a54.tar.gz rails-5fbbf4417c1e463a3429dfe5dcef9462e4771a54.tar.bz2 rails-5fbbf4417c1e463a3429dfe5dcef9462e4771a54.zip | |
Merge pull request #63 from carlosparamio/master
Fix name of parent resource params when declaring nested resources at routes
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index a5c1501f61..0c43954d81 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -1036,12 +1036,12 @@ module ActionDispatch # # This generates the following comments routes: # - # GET /photos/:id/comments/new - # POST /photos/:id/comments - # GET /photos/:id/comments/:id - # GET /photos/:id/comments/:id/edit - # PUT /photos/:id/comments/:id - # DELETE /photos/:id/comments/:id + # GET /photos/:photo_id/comments/new + # POST /photos/:photo_id/comments + # GET /photos/:photo_id/comments/:id + # GET /photos/:photo_id/comments/:id/edit + # PUT /photos/:photo_id/comments/:id + # DELETE /photos/:photo_id/comments/:id # # === Options # Takes same options as <tt>Base#match</tt> as well as: |