Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[4.6.x] fix: avoid change-after-check error in password policy component #5263

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 16, 2024

This is an automatic copy of pull request #5244 done by Mergify.


🆔 Reference related issue.

AM-4500

✏️ A description of the changes proposed in the pull request

This PR changes how the password-policy-status components performs validation to avoid update-after-check error.
It also fixes the check for the 'create' button on create user screen to properly ignore password validity when pre-registration is selected.


Cherry-pick of f2e3290 has failed:

On branch mergify/bp/4.6.x/pr-5244
Your branch is up to date with 'origin/4.6.x'.

You are currently cherry-picking commit f2e32901c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   gravitee-am-ui/src/app/domain/settings/password-policy/pass-policy-status/password-policy-status.component.ts
	both modified:   gravitee-am-ui/src/app/domain/settings/users/creation/user-creation.component.html
	both modified:   gravitee-am-ui/src/app/domain/settings/users/creation/user-creation.component.ts

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

(cherry picked from commit f2e3290)

# Conflicts:
#	gravitee-am-ui/src/app/domain/settings/password-policy/pass-policy-status/password-policy-status.component.ts
#	gravitee-am-ui/src/app/domain/settings/users/creation/user-creation.component.html
#	gravitee-am-ui/src/app/domain/settings/users/creation/user-creation.component.ts
@mergify mergify bot added the conflicts label Dec 16, 2024
@mergify mergify bot requested a review from a team as a code owner December 16, 2024 12:56
Copy link
Contributor Author

mergify bot commented Dec 16, 2024

Cherry-pick of f2e3290 has failed:

On branch mergify/bp/4.6.x/pr-5244
Your branch is up to date with 'origin/4.6.x'.

You are currently cherry-picking commit f2e32901c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   gravitee-am-ui/src/app/domain/settings/password-policy/pass-policy-status/password-policy-status.component.ts
	both modified:   gravitee-am-ui/src/app/domain/settings/users/creation/user-creation.component.html
	both modified:   gravitee-am-ui/src/app/domain/settings/users/creation/user-creation.component.ts

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant