fix: Simplify versioning interaction for better disentanglement (#182)

Author: fsbraun

CHANGELOG.rst

@@ -2,9 +2,9 @@
 Changelog
 =========
 
-Unreleased
-==========
-* Django 4.0 and 4.1 support added
+2.0.0rc1
+========
+* Django 4.0, 4.1, and 4.2 support added
 * Django 2.2 support removed
 * Python 3.7 support removed
 * Changed test setup to run tox from github actions for consistency in testing

djangocms_alias/models.py

@@ -178,21 +178,16 @@ def get_content(self, language=None, show_draft_content=False):
         try:
             return self._content_cache[language]
         except KeyError:
-            qs = self.contents.select_related(
+            if show_draft_content and is_versioning_enabled():
+                qs = self.contents(manager="admin_manager").latest_content()
+            else:
+                qs = self.contents.all()
+            qs = qs.select_related(
                 'alias__category',
             ).prefetch_related(
                 'placeholders'
             ).filter(language=language)
 
-            if show_draft_content and is_versioning_enabled():
-                from djangocms_versioning.constants import DRAFT, PUBLISHED
-                from djangocms_versioning.helpers import remove_published_where
-
-                # Ensure that we are getting the latest valid content, the top most version can become
-                # archived with a previous version re-published
-                qs = remove_published_where(qs)
-                qs = qs.filter(Q(versions__state=DRAFT) | Q(versions__state=PUBLISHED)).order_by('-versions__created')
-
             self._content_cache[language] = qs.first()
             return self._content_cache[language]
 

tests/test_views.py

@@ -1400,12 +1400,8 @@ def test_alias_not_shown_when_draft_when_visiting_page(self):
         When visiting a published page with a draft alias the alias
         is not visible
         """
-        from djangocms_versioning.helpers import remove_published_where
-
         unpublished_alias = self._create_alias(published=False)
-        content = remove_published_where(
-            unpublished_alias.contents.filter(language=self.language)
-        ).first()
+        content = unpublished_alias.contents(manager="admin_manager").filter(language=self.language).first()
         alias_placeholder = content.placeholder
 
         body = 'unpublished alias'