-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Fix email template rendering for product_type_added notification #14220
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
rossops
merged 2 commits into
DefectDojo:dev
from
omartinex:fix/product-type-added-email-template
Feb 9, 2026
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 |
|---|---|---|
| @@ -1,40 +1,57 @@ | ||
| {% load i18n %} | ||
| {% load navigation_tags %} | ||
| {% load display_tags %} | ||
| {% url 'view_product_type' product_type.id as product_type_url %} | ||
|
|
||
| <html> | ||
| <body> | ||
| {% autoescape on %} | ||
| <p> | ||
| {% trans "Hello" %}, | ||
| </p> | ||
| <p> | ||
| {% blocktranslate trimmed prod_url=url|full_url %} | ||
| The new product type "{{ title }}" has been added. It can be viewed here: <a href="{{ prod_url }}">{{ title }}</a> | ||
| {% endblocktranslate %} | ||
| </p> | ||
| <br/> | ||
| <br/> | ||
| {% trans "Kind regards" %},<br/> | ||
| <br/> | ||
| {% if system_settings.team_name %} | ||
| {{ system_settings.team_name }} | ||
| {% else %} | ||
| Defect Dojo | ||
| {% endif %} | ||
| <p> | ||
| <br/> | ||
| <br/> | ||
| <p> | ||
| {% url 'notifications' as notification_url %} | ||
| {% trans "You can manage your notification settings here" %}: <a href="{{ notification_url|full_url }}">{{ notification_url|full_url }}</a> | ||
| </p> | ||
| {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %} | ||
| <br/> | ||
| <div style="background-color:#DADCE2; border:1px #003333; padding:.8em; "> | ||
| <span style="font-size:16pt; font-family: 'Cambria','times new roman','garamond',serif; color:#ff0000;">{% trans "Disclaimer" %}</span><br/> | ||
| <p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer_notifications }}</p> | ||
| </div> | ||
| {% endif %} | ||
| {% endautoescape %} | ||
| </body> | ||
| <body> | ||
| {% autoescape on %} | ||
| <p> | ||
| {% trans "Hello" %}, | ||
| </p> | ||
|
|
||
| <p> | ||
| {% blocktranslate trimmed with title=title prod_url=product_type_url|full_url %} | ||
| The new product type "{{ title }}" has been added. | ||
| It can be viewed here: <a href="{{ prod_url }}">{{ title }}</a> | ||
| {% endblocktranslate %} | ||
| </p> | ||
|
|
||
| <br/> | ||
| <br/> | ||
|
|
||
| {% trans "Kind regards" %},<br/> | ||
| <br/> | ||
|
|
||
| {% if system_settings.team_name %} | ||
| {{ system_settings.team_name }} | ||
| {% else %} | ||
| Defect Dojo | ||
| {% endif %} | ||
|
|
||
| <p> | ||
| <br/> | ||
| <br/> | ||
| </p> | ||
|
|
||
| <p> | ||
| {% url 'notifications' as notification_url %} | ||
| {% trans "You can manage your notification settings here" %}: | ||
| <a href="{{ notification_url|full_url }}">{{ notification_url|full_url }}</a> | ||
| </p> | ||
|
|
||
| {% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %} | ||
| <br/> | ||
| <div style="background-color:#DADCE2; border:1px #003333; padding:.8em;"> | ||
| <span style="font-size:16pt; font-family:'Cambria','times new roman','garamond',serif; color:#ff0000;"> | ||
| {% trans "Disclaimer" %} | ||
| </span> | ||
| <br/> | ||
| <p style="font-size:11pt; line-height:10pt; font-family:'Cambria','times roman',serif;"> | ||
| {{ system_settings.disclaimer_notifications }} | ||
| </p> | ||
| </div> | ||
| {% endif %} | ||
| {% endautoescape %} | ||
| </body> | ||
| </html> | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a reason why you're leaving out this part?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for flagging this. There was no specific reason to remove that section, the intent of this PR is only to fix the template rendering issue.
I’ll restore that part to avoid introducing unrelated changes.