yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-28 07:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #521 from strapi/update-email-template

Browse Source 
Change data format email template
This commit is contained in:
Jim LAURIE 2018-01-26 11:44:05 +01:00 committed by GitHub
commit 2493b8c3ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/strapi-plugin-users-permissions/config/functions/bootstrap.js vendored
View File

@ -84,19 +84,6 @@ module.exports = cb => {
if (!_.get(strapi.plugins['users-permissions'], 'config.email')) {
try {
const email = {
'validation_email': {
display: 'Email.template.validation_email',
icon: 'envelope',
options: {
from: {
name: 'Administration Panel',
email: 'no-reply@strapi.io'
},
response_email: '',
object: '',
message: ''
}
},
'reset_password': {
display: 'Email.template.reset_password',
icon: 'refresh',
@ -111,23 +98,10 @@ module.exports = cb => {
<p>But don’t worry! You can use the following link to reset your password:</p>
<p><%= url %>?code=<%= token %></p>
<p><%= URL %>?code=<%= TOKEN %></p>
<p>Thanks.</p>`
}
},
'success_register': {
display: 'Email.template.success_register',
icon: 'check',
options: {
from: {
name: 'Administration Panel',
email: 'no-reply@strapi.io'
},
response_email: '',
object: '',
message: ''
}
}
};

8
packages/strapi-plugin-users-permissions/controllers/Auth.js
View File

@ -158,13 +158,13 @@ module.exports = {
const settings = strapi.plugins['users-permissions'].config.email['reset_password'].options;
settings.message = await strapi.plugins['users-permissions'].services.userspermissions.template(settings.message, {
url,
user: _.omit(user.toJSON(), ['password', 'resetPasswordToken', 'role', 'provider']),
token: resetPasswordToken
URL: url,
USER: _.omit(user.toJSON(), ['password', 'resetPasswordToken', 'role', 'provider']),
TOKEN: resetPasswordToken
});
settings.object = await strapi.plugins['users-permissions'].services.userspermissions.template(settings.object, {
user: _.omit(user.toJSON(), ['password', 'resetPasswordToken', 'role', 'provider'])
USER: _.omit(user.toJSON(), ['password', 'resetPasswordToken', 'role', 'provider'])
});
try {