Add better errors for disabled account recovery #15117

Merged
lunny merged 3 commits from password-recovery into main 2021-06-26 04:16:36 +00:00
Contributor

#2247 was brought to my attention again in another Discord, so I figured I would attempt to remedy the error and give some slightly more useful information to the user/admin.

#2247 was brought to my attention again in another Discord, so I figured I would attempt to remedy the error and give some slightly more useful information to the user/admin.
techknowlogick reviewed 2021-03-23 04:23:13 +00:00
@ -25,1 +25,3 @@
<p class="center">{{.i18n.Tr "auth.disable_forgot_password_mail"}}</p>
<p class="center">
{{if $.IsAdmin}}
{{.i18n.Tr "auth.disable_forgot_password_mail_admin"}}

will this ever be true? Wouldn't IsAdmin require the user to be logged in?

will this ever be true? Wouldn't IsAdmin require the user to be logged in?
jolheiser reviewed 2021-03-23 04:50:28 +00:00
@ -25,1 +25,3 @@
<p class="center">{{.i18n.Tr "auth.disable_forgot_password_mail"}}</p>
<p class="center">
{{if $.IsAdmin}}
{{.i18n.Tr "auth.disable_forgot_password_mail_admin"}}
Author
Contributor

Yes, and there is a "forgot password" link in user settings that would take them to this page.
Not sure what scenario it covers, exactly, though. Maybe forgot password but logged in with oauth?

Yes, and there is a "forgot password" link in user settings that would take them to this page. Not sure what scenario it covers, exactly, though. Maybe forgot password but logged in with oauth?
zeripath approved these changes 2021-06-23 21:17:39 +00:00
6543 (Migrated from github.com) approved these changes 2021-06-26 03:45:30 +00:00
This repo is archived. You cannot comment on pull requests.
No reviewers
No Milestone
No project
No Assignees
4 Participants
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: lunny/gitea#15117
No description provided.