fix djangocms-versioning draft deletion bug (#214) #215
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
fsbraun
requested changes
Jan 30, 2024
djangocms_alias/admin.py
Outdated
|
|
||
| def delete_model(self, request: HttpRequest, obj: AliasContent): | ||
| if obj.alias.contents.filter(language=obj.language).count() == 1: | ||
| message = _("Draft deleted. A new empty draft will be created automatically if needed.") |
There was a problem hiding this comment.
Suggested change
| message = _("Draft deleted. A new empty draft will be created automatically if needed.") | |
| message = _("Alias content for language {} deleted. A new empty alias content will be created if needed.").format(obj.language) |
Not all use cases of djangocms-alias will be in association with versioning. The reference to a draft version does not apply universally. (Sorry, I know I suggested the text in the first place. )
djangocms_alias/admin.py
Outdated
| @@ -173,3 +173,13 @@ def has_module_permission(self, request: HttpRequest) -> bool: | |||
| """Hides admin class in admin site overview""" | |||
|
|
|||
| return False | |||
|
|
|||
| def delete_model(self, request: HttpRequest, obj: AliasContent): | |||
| if obj.alias.contents.filter(language=obj.language).count() == 1: | |||
There was a problem hiding this comment.
I'm not sure if that condition is correct. If verisoning is stalled, alias.contents will give published results only.
Suggested change
| if obj.alias.contents.filter(language=obj.language).count() == 1: | |
| if obj.alias._default_manager.filter(language=obj.language).count() == 1: |
fscherf
force-pushed
the
fscherf/fix-draft-deletion-bug
branch
from
21a8672
to
ea8db29
Compare
|
@fsbraun Thanks for your review. I applied both requested changes |
|
@fsbraun: Is there anything else that I can do? |
|
@fsbraun: What is the state of this PR? Can it be merged? |
|
@fscherf LGTM! I will give it a test asap and merge afterwards! |
|
So, tests should pass again! |
|
@fscherf I can confirm, that deleting the alias draft does not remove all connected alias plugins. However, I fail to get the new message. Can you point me to where I should be seeing this? |
|
@fsbraun: Ah! It seems, the message is not shown when using djangocms-versioning, because it overrides the delete method. |
|
@fsbraun: It works, but the message does not show up in all cases. Is that enough, or do we need to change plans here? |
marksweb
force-pushed
the
fscherf/fix-draft-deletion-bug
branch
from
4f3497c
to
dcb0a9a
Compare
|
What's the state of this PR? |
Previously, `djangocms_alias.models.AliasContent.delete` deleted all plugins related to `AliasContent.alias`, with the same language. Drafts and previously published versions included. This meant that the deletion of a draft resulted in plugins disappearing from published pages. This patch removes the mechanism entirely and instead adds a warning, notifying the user that the last version or translation of a language got deleted. Signed-off-by: Florian Scherf <mail@florianscherf.de>
for more information, see https://pre-commit.ci
marksweb
force-pushed
the
fscherf/fix-draft-deletion-bug
branch
from
1706862
to
5eeb8da
Compare
fsbraun
approved these changes
Mar 10, 2024
fscherf
added a commit
to fscherf/djangocms-alias
that referenced
this pull request
Apr 9, 2024
…cms#215) * fix djangocms-versioning draft deletion bug (django-cms#214) Previously, `djangocms_alias.models.AliasContent.delete` deleted all plugins related to `AliasContent.alias`, with the same language. Drafts and previously published versions included. This meant that the deletion of a draft resulted in plugins disappearing from published pages. This patch removes the mechanism entirely and instead adds a warning, notifying the user that the last version or translation of a language got deleted. Signed-off-by: Florian Scherf <mail@florianscherf.de> * ci: auto fixes from pre-commit hooks for more information, see https://pre-commit.ci --------- Signed-off-by: Florian Scherf <mail@florianscherf.de> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
FinalAngel
pushed a commit
that referenced
this pull request
Apr 11, 2024
* fix djangocms-versioning draft deletion bug (#214) (#215) * fix djangocms-versioning draft deletion bug (#214) Previously, `djangocms_alias.models.AliasContent.delete` deleted all plugins related to `AliasContent.alias`, with the same language. Drafts and previously published versions included. This meant that the deletion of a draft resulted in plugins disappearing from published pages. This patch removes the mechanism entirely and instead adds a warning, notifying the user that the last version or translation of a language got deleted. Signed-off-by: Florian Scherf <mail@florianscherf.de> * ci: auto fixes from pre-commit hooks for more information, see https://pre-commit.ci --------- Signed-off-by: Florian Scherf <mail@florianscherf.de> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * tests: requirements: django42: fix broken djangocms-versioning URL Signed-off-by: Florian Scherf <mail@florianscherf.de> --------- Signed-off-by: Florian Scherf <mail@florianscherf.de> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
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.
Previously,
djangocms_alias.models.AliasContent.deletedeleted all plugins related toAliasContent.alias, with the same language. Drafts and previously published versions included.This meant that the deletion of a draft resulted in plugins disappearing from published pages.
This patch removes the mechanism entirely and instead adds a warning, notifying the user that the last version or translation of a language got deleted.