birger/1433 merge #1457
Open
birger/1433 merge #1457
+68
−76
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
b1rger
force-pushed
the
birger/1433-merge
branch
from
f16f7fa
to
5e778ea
Compare
This view provides a simple form to select an internal or external entity to merge its values in the entity that is modified.
The `get_merge_view_url` is being replaced by a generic `get_select_merge_or_enrich_url`. It does basically the same, but lives in the `generic` app.
It is not needed anymore, now that the SelectMergeOrEnrich view exists in the generic app.
We use the legacy abstractentity_merge.html template to override the default template for the selectmergeordelete view.
b1rger
force-pushed
the
birger/1433-merge
branch
from
5e778ea
to
3e97519
Compare
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.
Closes: #1433