Merge pull request #1024 from YaleSTC/1017_request_email_links_master

resolves #1017

Author: orenyk

README.md

@@ -91,7 +91,7 @@ Reservations ships with the default config time set to Eastern Time (US and Cana
 You will need to generate a fresh secret key for cookie encryption and signing. Run `rake secret` and paste the output into `config/intializers/secret_token.rb`. Do not make this key available to the public, otherwise anyone will be able to sign on as anyone to Reservations.
 
 You will need to also configure the email config in
-`config/initializers/setup_mail.rb`. Replace `0.0.0.0:3000` with the
+`config/environments/production.rb`. Replace `example.com` with the
 relevant hostname. This will allow links in emails to point to the
 correct places.
 

app/views/admin_mailer/request_filed.html.erb

@@ -1,10 +1,10 @@
 <p>A new reservation request has been filed by
-<%= link_to @reservation.reserver.name, @reservation.reserver %></p>
+<%= link_to @reservation.reserver.name, user_url(@reservation.reserver, only_path: false) %></p>
 <ul>
-<li>Equipment requested: <%= link_to @reservation.equipment_model.name, @reservation.equipment_model %> </li>
-<li>Requested start date: <%= @reservation.start_date.to_date.to_s(:long) %></li>
-<li>Requested end date: <%= @reservation.due_date.to_date.to_s(:long) %></li>
-<li>Notes: <%= @reservation.notes %></li>
+  <li>Equipment requested: <%= link_to @reservation.equipment_model.name, equipment_model_url(@reservation.equipment_model, only_path: false) %> </li>
+  <li>Requested start date: <%= @reservation.start_date.to_date.to_s(:long) %></li>
+  <li>Requested end date: <%= @reservation.due_date.to_date.to_s(:long) %></li>
+  <li>Notes: <%= @reservation.notes %></li>
 </ul>
-<p>Click <%= link_to "here", review_request_path(@reservation) %> to review this request</p>
+<p>Click <%= link_to "here", review_request_url(@reservation, only_path: false) %> to review this request</p>
 

config/environments/development.rb

@@ -21,6 +21,7 @@
 
   # Use letter_opener for development mail testing
   config.action_mailer.delivery_method = ENV['USER'] == 'vagrant' ? :letter_opener_web : :letter_opener
+  config.action_mailer.default_url_options = { host: "localhost:3000" }
 
   # Print deprecation notices to the Rails logger
   config.active_support.deprecation = :log

config/environments/production.rb

@@ -41,6 +41,10 @@
   # Enable threaded mode
   # config.threadsafe!
 
+  # mailer host: replace 'example.com' with your root url
+  # this will allow links in email text to function correctly
+  config.action_mailer.default_url_options = { host: "example.com" }
+
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation can not be found)
   config.i18n.fallbacks = true

config/environments/test.rb

@@ -25,6 +25,7 @@
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
+  config.action_mailer.default_url_options = { host: "localhost:3000" }
 
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper,

config/initializers/setup_mail.rb

@@ -10,8 +10,4 @@
   #:password            => "password",
   :enable_starttls_auto => true
 
-}
-
-# mailer host: replace "0.0.0.0:3000" with your root url in production
-# this will allow links in e-mail text to function correctly
-ActionMailer::Base.default_url_options[:host] = "0.0.0.0:3000"
+}