Commit 3de4d313 authored by Haunui Saint-sevin's avatar Haunui Saint-sevin

Remove html tag from the text part of email

Instead of calling single function emitting HTML tags in the HTML part
of email, directly output HTML tags or raw text.
parent e5a74e0b
...@@ -57,12 +57,6 @@ module EmailsHelper ...@@ -57,12 +57,6 @@ module EmailsHelper
pluralize(valid_length, unit) pluralize(valid_length, unit)
end end
def reset_token_expire_message
link_tag = link_to('request a new one', new_user_password_url(user_email: @user.email))
"This link is valid for #{password_reset_token_valid_time}. " \
"After it expires, you can #{link_tag}."
end
def header_logo def header_logo
if current_appearance&.header_logo? if current_appearance&.header_logo?
image_tag( image_tag(
......
...@@ -13,4 +13,5 @@ ...@@ -13,4 +13,5 @@
%p %p
= link_to "Click here to set your password", edit_password_url(@user, reset_password_token: @token) = link_to "Click here to set your password", edit_password_url(@user, reset_password_token: @token)
%p %p
= raw reset_token_expire_message This link is valid for #{password_reset_token_valid_time}.
After it expires, you can #{link_to("request a new one", new_user_password_url(user_email: @user.email))}.
...@@ -4,7 +4,9 @@ The Administrator created an account for you. Now you are a member of the compan ...@@ -4,7 +4,9 @@ The Administrator created an account for you. Now you are a member of the compan
login.................. <%= @user.email %> login.................. <%= @user.email %>
<% if @user.created_by_id %> <% if @user.created_by_id %>
<%= link_to "Click here to set your password", edit_password_url(@user, :reset_password_token => @token) %> Click here to set your password:
<%= edit_password_url(@user, :reset_password_token => @token) %>
<%= reset_token_expire_message %> This link is valid for <%= password_reset_token_valid_time %>. After it expires, you can request a new one here:
<%= new_user_password_url(user_email: @user.email) %>
<% end %> <% end %>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment