Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Server: Rename admin button "Send reset password email" to more correct "Send account information email"

pull/5491/head
Laurent Cozic 2021-09-20 11:53:35 +01:00
parent c91d4bda3c
commit 37d446b970
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/server/src/routes/index/users.ts
View File

@ -265,7 +265,7 @@ interface FormFields {
disable_button: string; disable_button: string;
restore_button: string; restore_button: string;
cancel_subscription_button: string; cancel_subscription_button: string;
send_reset_password_email: string; send_account_confirmation_email: string;
update_subscription_basic_button: string; update_subscription_basic_button: string;
update_subscription_pro_button: string; update_subscription_pro_button: string;
user_cancel_subscription_button: string; user_cancel_subscription_button: string;
@ -306,7 +306,7 @@ router.post('users', async (path: SubPath, ctx: AppContext) => {
const user = await models.user().load(path.id); const user = await models.user().load(path.id);
await models.user().checkIfAllowed(ctx.joplin.owner, AclAction.Delete, user); await models.user().checkIfAllowed(ctx.joplin.owner, AclAction.Delete, user);
await models.userFlag().toggle(user.id, UserFlagType.ManuallyDisabled, !fields.restore_button); await models.userFlag().toggle(user.id, UserFlagType.ManuallyDisabled, !fields.restore_button);
} else if (fields.send_reset_password_email) { } else if (fields.send_account_confirmation_email) {
const user = await models.user().load(path.id); const user = await models.user().load(path.id);
await models.user().save({ id: user.id, must_set_password: 1 }); await models.user().save({ id: user.id, must_set_password: 1 });
await models.user().sendAccountConfirmationEmail(user); await models.user().sendAccountConfirmationEmail(user);

2
packages/server/src/views/index/user.mustache
View File

@ -95,7 +95,7 @@
<div class="control block"> <div class="control block">
<input type="submit" name="post_button" class="button is-primary" value="{{buttonTitle}}" /> <input type="submit" name="post_button" class="button is-primary" value="{{buttonTitle}}" />
{{#showResetPasswordButton}} {{#showResetPasswordButton}}
<input type="submit" name="send_reset_password_email" class="button is-warning" value="Send reset password email" /> <input type="submit" name="send_account_confirmation_email" class="button is-warning" value="Send account confirmation email" />
{{/showResetPasswordButton}} {{/showResetPasswordButton}}
{{#showDisableButton}} {{#showDisableButton}}
<input type="submit" name="disable_button" class="button is-danger" value="Disable" /> <input type="submit" name="disable_button" class="button is-danger" value="Disable" />