Bug/VOGRE-45 #49
Closed
Bug/VOGRE-45 #49
Conversation
This file contains 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
|
Can one of the admins verify this patch? |
jdamerow
requested changes
Jan 9, 2025
| @@ -127,7 +127,7 @@ <h5 class="list-group-item-heading mb-0">Group Texts</h5> | |||
| <path d="M14 4.5V14a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V2a2 2 0 0 1 2-2h5.5zm-3 0A1.5 1.5 0 0 1 9.5 3V1H4a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V4.5z"/> | |||
| </svg>{% else %}{% endif %}</td> | |||
| <td> | |||
| <a href="{% if project_id %}{% url 'repository_text_import' repository.id group_id text.key project_id %}{% else %}{% url 'repository_text_import' repository.id group_id text.key %}{% endif %}" class="btn btn-primary btn-sm">Import</a> | |||
| <a href="{% if project_id %}{% url 'repository_text_import' repository.id group_id text.key project_id %}{% else %}{% url 'repository_project_list' repository.id group_id text.key %}{% endif %}" class="btn btn-primary btn-sm">Import</a> | |||
There was a problem hiding this comment.
looking at this more closely, just put the redirect url here directly instead of having the if statement in the view method.
vogon/urls.py
Outdated
| @@ -132,6 +132,7 @@ | |||
| re_path(r'^repository/(?P<repository_id>[0-9]+)/search/$', views.repository_views.repository_search, name='repository_search'), | |||
| re_path(r'^repository/(?P<repository_id>[0-9]+)/collections/(?P<group_id>[0-9]+)/$', views.repository_views.repository_collection, name='repository_collection'), | |||
| re_path(r'^repository/(?P<repository_id>[0-9]+)/collection/(?P<group_id>[0-9]+)/group-collection/(?P<group_collection_id>[a-zA-Z0-9]+)/texts/$', views.repository_views.repository_collection_texts, name='repository_collections_text_list'), | |||
| re_path(r'^repository/(?P<repository_id>[0-9]+)/group/(?P<group_id>[a-zA-Z0-9]+)/text/(?P<text_key>[a-zA-Z0-9]+)/project/$', views.repository_views.repository_text_import, name='repository_project_list'), | |||
|
Resolve conflicts please |
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.
Guidelines for Pull Requests
If you haven't yet read our code review guidelines, please do so, You can find them here.
Please confirm the following by adding an x for each item (turn
[ ]into[x]).Please provide a brief description of your ticket
When you try to add a text from the Text menu (when you don’t select a project), the project id is missing when trying to add a text.
404: .../repository/1/group/2601560/text/ZQ5EDSBR/project/
https://diging.atlassian.net/browse/VOGRE-45
Are there any other pull requests that this one depends on?
Anything else the reviewer needs to know?
... describe here ...