-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Fix user password reset mail template value #12882
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
Merged
sureshanaparti
merged 13 commits into
apache:4.22
from
scclouds:fix-reset-link-default-value
Apr 15, 2026
Merged
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
7a55eef
Fix default user password reset email template
erikbocks 34cb3b6
improve readabilty
erikbocks 29e28c2
change update query
erikbocks dc929f1
Merge remote-tracking branch 'origin/4.22' into fix-reset-link-defaul…
erikbocks 4c6157b
Apply suggestion from @GaOrtiga
erikbocks d9bd43e
Add newline at the end of file
erikbocks 29cb0b9
Specify database for update
erikbocks c7c48f1
Address Ortiga's review
erikbocks 68b76a9
Update engine/schema/src/main/resources/META-INF/db/schema-42200to422…
erikbocks 6b761c9
Fix SQL statement
erikbocks 151cd06
Merge remote-tracking branch 'origin/4.22' into fix-reset-link-defaul…
erikbocks 5c9224a
Merge remote-tracking branch 'origin/4.22' into fix-reset-link-defaul…
erikbocks 1ee8ce1
Use CONCAT_WS sql method to create multiline string
erikbocks File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -35,3 +35,11 @@ UPDATE `cloud`.`alert` SET type = 34 WHERE name = 'ALERT.VR.PRIVATE.IFACE.MTU'; | |||||||||||||
| UPDATE `cloud`.`configuration` SET description = 'True if the management server will restart the agent service via SSH into the KVM hosts after or during maintenance operations', is_dynamic = 1 WHERE name = 'kvm.ssh.to.agent'; | ||||||||||||||
|
|
||||||||||||||
| UPDATE `cloud`.`vm_template` SET guest_os_id = 99 WHERE name = 'kvm-default-vm-import-dummy-template'; | ||||||||||||||
|
|
||||||||||||||
| -- Update `user.password.reset.mail.template` configuration value to match new logic | ||||||||||||||
| update configuration | ||||||||||||||
| set value = 'Hello {{username}}!\nYou have requested to reset your password. Please click the following link to reset your password:\n{{{resetLink}}}\nIf you did not request a password reset,please ignore this email.\n\nRegards,\nThe CloudStack Team' | ||||||||||||||
| where value in ( | ||||||||||||||
| 'Hello {{username}}!\nYou have requested to reset your password. Please click the following link to reset your password:\nhttp://{{{resetLink}}}\nIf you did not request a password reset,please ignore this email.\n\nRegards,\nThe CloudStack Team', | ||||||||||||||
| 'Hello {{username}}!\nYou have requested to reset your password. Please click the following link to reset your password:\n{{{domainUrl}}}{{{resetLink}}}\nIf you did not request a password reset,please ignore this email.\n\nRegards,\nThe CloudStack Team' | ||||||||||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. agree to update the value if it has the previous defaults. ConfigDepot does not update value. Lines 208 to 213 in c1af36f
|
||||||||||||||
| ) | ||||||||||||||
|
erikbocks marked this conversation as resolved.
Outdated
|
||||||||||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.