12
113
Fork
You've already forked django-allauth
149

feat(account): Move "Forgot your password?" to current password help text in change password form and make it customizable #4765

Open
poypoyan wants to merge 1 commit from poypoyan/django-allauth:custom-forgot-change-pw into main
pull from: poypoyan/django-allauth:custom-forgot-change-pw
merge into: allauth:main
allauth:main
allauth:fix/account-middleware-reauth-exc-vs-api
allauth:65.12.x
allauth:65.11.x
allauth:feat/openid-connect-id-token
allauth:fix/phone-vs-social-signup
allauth:65.8.x
allauth:feat/idp
allauth:feat/resend-code-or-change
allauth:fix/phone-signup-conflict
allauth:feat/phone
allauth:fix/headless-email-verification-by-code
allauth:fix/a11y
allauth:feat/facebook-limited-login
allauth:fix/headless-only-connect-reauth
allauth:fix/email-added-vs-code-verification
allauth:feat/login-required-middleware
allauth:0.63.x
allauth:refactor-unique-true-field
allauth:0.62.x
allauth:0.57.x
allauth:0.60.x
allauth:0.55.x
allauth:feat-metamask
First-time contributor
Copy link

Fixes: #4745

Just reused the relevant code of LoginForm._setup_password_field(). Hence I moved that code to PasswordHelpTextMixin. Hope that's ok. Now I am unsure if both help text in change password and login should be customized by the same password_reset_help_text.html, but for me it makes little sense to make the two different.

General

  • Make sure you use semantic commit messages.
    Examples: "fix(google): Fixed foobar bug", "feat(accounts): Added foobar feature".
  • All Python code must formatted using Black, and clean from pep8 and isort issues.
  • JavaScript code should adhere to StandardJS.
  • If your changes are significant, please update ChangeLog.rst.
  • If your change is substantial, feel free to add yourself to AUTHORS.
Fixes: #4745 Just reused the relevant code of `LoginForm._setup_password_field()`. Hence I moved that code to `PasswordHelpTextMixin`. Hope that's ok. Now I am unsure if both help text in change password and login should be customized by the same `password_reset_help_text.html`, but for me it makes little sense to make the two different. ## General - [x] Make sure you use [semantic commit messages](https://seesparkbox.com/foundry/semantic_commit_messages). Examples: `"fix(google): Fixed foobar bug"`, `"feat(accounts): Added foobar feature"`. - [x] All Python code must formatted using Black, and clean from pep8 and isort issues. - [ ] JavaScript code should adhere to [StandardJS](https://standardjs.com). - [x] If your changes are significant, please update `ChangeLog.rst`. - [ ] If your change is substantial, feel free to add yourself to `AUTHORS`.
feat(account): Move "Forgot your password?" to current password help text in change password form and make it customizable
Some checks are pending
ci/woodpecker/pr/woodpecker/1 Pipeline is pending approval
ci/woodpecker/pr/woodpecker/2 Pipeline is pending approval
0515216f6e
Add tests in test_change_password
Some checks are pending
ci/woodpecker/pr/woodpecker/1 Pipeline is pending approval
ci/woodpecker/pr/woodpecker/2 Pipeline is pending approval
1c1ee48697
poypoyan force-pushed custom-forgot-change-pw from 1c1ee48697
Some checks are pending
ci/woodpecker/pr/woodpecker/1 Pipeline is pending approval
ci/woodpecker/pr/woodpecker/2 Pipeline is pending approval
to 7d3d5ba676
Some checks are pending
ci/woodpecker/pr/woodpecker/1 Pipeline is pending approval
ci/woodpecker/pr/woodpecker/2 Pipeline is pending approval
2026年07月09日 16:37:18 +02:00
Compare
Some checks are pending
ci/woodpecker/pr/woodpecker/1 Pipeline is pending approval
ci/woodpecker/pr/woodpecker/2 Pipeline is pending approval
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u custom-forgot-change-pw:poypoyan-custom-forgot-change-pw
git switch poypoyan-custom-forgot-change-pw

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff poypoyan-custom-forgot-change-pw
git switch poypoyan-custom-forgot-change-pw
git rebase main
git switch main
git merge --ff-only poypoyan-custom-forgot-change-pw
git switch poypoyan-custom-forgot-change-pw
git rebase main
git switch main
git merge --no-ff poypoyan-custom-forgot-change-pw
git switch main
git merge --squash poypoyan-custom-forgot-change-pw
git switch main
git merge --ff-only poypoyan-custom-forgot-change-pw
git switch main
git merge poypoyan-custom-forgot-change-pw
git push origin main
Sign in to join this conversation.
No reviewers
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
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
allauth/django-allauth!4765
Reference in a new issue
allauth/django-allauth
No description provided.
Delete branch "poypoyan/django-allauth:custom-forgot-change-pw"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?