add optional return_url parameter to "Add" button for missing prerequisites #20128
+8
−7
Conversation
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
…erequisites.html to return user back to initial page
jnovinger
requested changes
Aug 19, 2025
Comment on lines
1
to
10
| {% if url %} | ||
| {% load i18n %} | ||
| <a href="{{ url }}" type="button" class="btn btn-primary"> | ||
| <i class="mdi mdi-plus-thick"></i> {% trans "Add" %} | ||
| </a> | ||
| {% endif %} | ||
| {% load i18n %} | ||
| {% if return_url %} | ||
| <a href="{{ url }}?return_url={{ return_url }}" type="button" class="btn btn-primary"> | ||
| {% else %} | ||
| <a href="{{ url }}" type="button" class="btn btn-primary"> | ||
| {% endif %} | ||
| <i class="mdi mdi-plus-thick"></i> {% trans "Add" %} | ||
| </a> | ||
| {% endif %} |
There was a problem hiding this comment.
This can be simplified to avoid repeating ourselves:
Suggested change
| {% if url %} | |
| {% load i18n %} | |
| <a href="{{ url }}" type="button" class="btn btn-primary"> | |
| <i class="mdi mdi-plus-thick"></i> {% trans "Add" %} | |
| </a> | |
| {% endif %} | |
| {% load i18n %} | |
| {% if return_url %} | |
| <a href="{{ url }}?return_url={{ return_url }}" type="button" class="btn btn-primary"> | |
| {% else %} | |
| <a href="{{ url }}" type="button" class="btn btn-primary"> | |
| {% endif %} | |
| <i class="mdi mdi-plus-thick"></i> {% trans "Add" %} | |
| </a> | |
| {% endif %} | |
| {% if url %} | |
| {% load i18n %} | |
| <a href="{{ url }}{% if return_url %}?return_url={{ return_url }}{% endif %}" type="button" class="btn btn-primary"> | |
| <i class="mdi mdi-plus-thick"></i> {% trans "Add" %} | |
| </a> | |
| {% endif %} |
There was a problem hiding this comment.
ah of course, makes sense. django templates still feel a bit strange to me.
i commited the fix
jnovinger
approved these changes
Aug 20, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes: #19990
add optional return_url parameter to "Add" button, used in missing_prerequisites.html to return user back to initial page after adding an prerequisite object