aboutsummaryrefslogtreecommitdiffstats
path: root/config/routes.rb
diff options
context:
space:
mode:
authorDavid Cabo <david@calibea.com>2011-10-13 00:31:56 +0200
committerDavid Cabo <david@calibea.com>2011-10-13 00:31:56 +0200
commit6b19c36f114624d7e53be8edc9ee490ecd20d0b0 (patch)
tree7741c3655fe5e3cbc90dd20a4626ac7acc1bf6b0 /config/routes.rb
parent6800b9ff3fc77aa441afbdb0b0196afbdd87d8b4 (diff)
parente13127a8ebc8bf8379d92f778af5a2bb6931d80c (diff)
Merge branch 'release/0.4' into develop
Diffstat (limited to 'config/routes.rb')
-rw-r--r--config/routes.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 3dfa30d5a..48bf92e75 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -104,10 +104,9 @@ ActionController::Routing::Routes.draw do |map|
body.show_public_body_successful "/body/:url_name/successful", :action => 'show', :view => "successful"
body.show_public_body_unsuccessful "/body/:url_name/unsuccessful", :action => 'show', :view => "unsuccessful"
body.show_public_body_awaiting "/body/:url_name/awaiting", :action => 'show', :view => "awaiting"
+ body.view_public_body_email "/body/:url_name/view_email", :action => 'view_email'
body.show_public_body_tag "/body/:url_name/:tag", :action => 'show'
body.show_public_body_tag_view "/body/:url_name/:tag/:view", :action => 'show'
-
- body.view_public_body_email "/body/:url_name/view_email", :action => 'view_email'
end
map.with_options :controller => 'comment' do |comment|
@@ -137,7 +136,7 @@ ActionController::Routing::Routes.draw do |map|
map.with_options :controller => 'help' do |help|
help.help_unhappy '/help/unhappy/:url_title', :action => 'unhappy'
help.help_about '/help/about', :action => 'about'
- help.help_about '/help/alaveteli', :action => 'alaveteli'
+ help.help_alaveteli '/help/alaveteli', :action => 'alaveteli'
help.help_contact '/help/contact', :action => 'contact'
help.help_officers '/help/officers', :action => 'officers'
help.help_requesting '/help/requesting', :action => 'requesting'