diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-05-03 20:10:10 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-05-03 20:10:10 -0300 |
| commit | 39b0411ce098a4c9743a639d7008f2c44f2eef3c (patch) | |
| tree | bd06248eb25b8037bf09f4014040d2d5b70ef26a /railties/lib/rails | |
| parent | d70d575158a3976888b37f50d2a338ade9759cd8 (diff) | |
| parent | f5132c19d52c4457aa2e09c647d2f52a73966c68 (diff) | |
| download | rails-39b0411ce098a4c9743a639d7008f2c44f2eef3c.tar.gz rails-39b0411ce098a4c9743a639d7008f2c44f2eef3c.tar.bz2 rails-39b0411ce098a4c9743a639d7008f2c44f2eef3c.zip | |
Merge pull request #19093 from remomueller/fix-actionmailer-preview-links-on-subdirectories
Mailer preview now uses `url_for` to fix links to emails for apps runnin...
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/templates/rails/mailers/index.html.erb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/templates/rails/mailers/mailer.html.erb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/templates/rails/mailers/index.html.erb b/railties/lib/rails/templates/rails/mailers/index.html.erb index c4c9757d57..000930c039 100644 --- a/railties/lib/rails/templates/rails/mailers/index.html.erb +++ b/railties/lib/rails/templates/rails/mailers/index.html.erb @@ -1,8 +1,8 @@ <% @previews.each do |preview| %> -<h3><%= link_to preview.preview_name.titleize, "/rails/mailers/#{preview.preview_name}" %></h3> +<h3><%= link_to preview.preview_name.titleize, url_for(controller: "rails/mailers", action: "preview", path: preview.preview_name) %></h3> <ul> <% preview.emails.each do |email| %> -<li><%= link_to email, "/rails/mailers/#{preview.preview_name}/#{email}" %></li> +<li><%= link_to email, url_for(controller: "rails/mailers", action: "preview", path: "#{preview.preview_name}/#{email}") %></li> <% end %> </ul> <% end %> diff --git a/railties/lib/rails/templates/rails/mailers/mailer.html.erb b/railties/lib/rails/templates/rails/mailers/mailer.html.erb index 607c8d1677..c12ead0f90 100644 --- a/railties/lib/rails/templates/rails/mailers/mailer.html.erb +++ b/railties/lib/rails/templates/rails/mailers/mailer.html.erb @@ -1,6 +1,6 @@ <h3><%= @preview.preview_name.titleize %></h3> <ul> <% @preview.emails.each do |email| %> -<li><%= link_to email, "/rails/mailers/#{@preview.preview_name}/#{email}" %></li> +<li><%= link_to email, url_for(controller: "rails/mailers", action: "preview", path: "#{@preview.preview_name}/#{email}") %></li> <% end %> </ul> |