Ticket 1022: improve routes to avoid confusion

tslocke · Oct 12, 2012 · 4a468fc · 4a468fc
1 parent dcb1999
commit 4a468fc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/hobo/lib/generators/hobo/front_controller/front_controller_generator.rb b/hobo/lib/generators/hobo/front_controller/front_controller_generator.rb
@@ -44,7 +44,7 @@ def remove_index_html
     def add_routes
       return unless options[:add_routes]
       route "match 'search' => '#{file_path}#search', :as => 'site_search'"
-      route "match '#{options[:user_resource_name]}s/:id/activate/:key' => '#{options[:user_resource_name]}s#activate'"
+      route "match '#{options[:user_resource_name]}s/:id/activate_from_email/:key' => '#{options[:user_resource_name]}s#activate', :as => 'activate_from_email'"
       if class_path.empty?
         route "root :to => '#{file_path}#index'"
         route "match ENV['RAILS_RELATIVE_URL_ROOT'] => 'front#index' if ENV['RAILS_RELATIVE_URL_ROOT']"

diff --git a/hobo/lib/generators/hobo/user_mailer/templates/activation.erb b/hobo/lib/generators/hobo/user_mailer/templates/activation.erb
@@ -2,7 +2,7 @@
 
 To activate your account for <%%= @app_name %>, click on this link:
 
-  <%%= activate_<%= name.underscore -%>_url :id => @<%= name.underscore -%>%>/<%%= @key %>
+  <%%= activate_from_email_url :id => @<%= name.underscore -%>, :key => @key %>
 
 Thank you,