Merge branch 'master' into feature/modernize-python-django-support

Author: fsbraun

djangocms_versioning/admin.py

@@ -8,6 +8,7 @@
 from cms.utils.urlutils import admin_reverse
 from django.conf import settings
 from django.contrib.admin.utils import flatten_fieldsets
+from django.contrib.sites.shortcuts import get_current_site
 from django.core.exceptions import (
     ImproperlyConfigured,
     ObjectDoesNotExist,
@@ -52,13 +53,10 @@ def __init__(self):
     @cached_property
     def versionables_by_content(self):
         """Returns a dict of {content_model_cls: VersionableItem obj}"""
-        return {
-            versionable.content_model: versionable for versionable in self.versionables
-        }
+        return {versionable.content_model: versionable for versionable in self.versionables}
 
     def is_content_model_versioned(self, content_model):
-        """Returns if the content model is registered for versioning.
-        """
+        """Returns if the content model is registered for versioning."""
         return content_model in self.versionables_by_content
 
     @cached_property
@@ -91,9 +89,7 @@ def handle_versioning_setting(self, cms_config):
             # still changing and needs to be calculated on the fly
             registered_so_far = [v.content_model for v in self.versionables]
             if versionable.content_model in registered_so_far:
-                raise ImproperlyConfigured(
-                    f"{versionable.content_model!r} has already been registered"
-                )
+                raise ImproperlyConfigured(f"{versionable.content_model!r} has already been registered")
             # Checks passed. Add versionable to our master list
             self.versionables.append(versionable)
 
@@ -118,15 +114,13 @@ def handle_admin_classes(self, cms_config):
         with an admin model class that inherits from `versionable.content_admin_mixin`.
         """
         replace_admin_for_models(
-            [
-                (versionable.content_model, versionable.content_admin_mixin)
-                for versionable in cms_config.versioning
-            ]
+            [(versionable.content_model, versionable.content_admin_mixin) for versionable in cms_config.versioning]
         )
         replace_admin_for_models(
             [
                 (versionable.grouper_model, versionable.grouper_admin_mixin)
-                for versionable in cms_config.versioning if versionable.grouper_admin_mixin is not None
+                for versionable in cms_config.versioning
+                if versionable.grouper_admin_mixin is not None
             ]
         )
 
@@ -153,12 +147,15 @@ def handle_content_model_manager(self, cms_config):
         """
         for versionable in cms_config.versioning:
             replace_manager(versionable.content_model, "objects", PublishedContentManagerMixin)
-            replace_manager(versionable.content_model, "admin_manager", AdminManagerMixin,
-                            _group_by_key=list(versionable.grouping_fields))
+            replace_manager(
+                versionable.content_model,
+                "admin_manager",
+                AdminManagerMixin,
+                _group_by_key=list(versionable.grouping_fields),
+            )
 
     def handle_admin_field_modifiers(self, cms_config):
-        """Allows for the transformation of a given field in the ExtendedVersionAdminMixin
-        """
+        """Allows for the transformation of a given field in the ExtendedVersionAdminMixin"""
         extended_admin_field_modifiers = getattr(cms_config, "extended_admin_field_modifiers", None)
         if not isinstance(extended_admin_field_modifiers, list):
             raise ImproperlyConfigured("extended_admin_field_modifiers must be list of dictionaries")
@@ -171,9 +168,7 @@ def configure_app(self, cms_config):
             self.handle_admin_field_modifiers(cms_config)
         # Validation to ensure either the versioning or the
         # versioning_add_to_confirmation_context config has been defined
-        has_extra_context = hasattr(
-            cms_config, "versioning_add_to_confirmation_context"
-        )
+        has_extra_context = hasattr(cms_config, "versioning_add_to_confirmation_context")
         has_models_to_register = hasattr(cms_config, "versioning")
         if not has_extra_context and not has_models_to_register:
             raise ImproperlyConfigured(
@@ -257,9 +252,11 @@ def get_readonly_fields(self, request, obj=None):
         return fields
 
     def get_queryset(self, request):
-        queryset = super().get_queryset(request)\
+        return (
+            super()
+            .get_queryset(request)
             .prefetch_related(Prefetch("versions", to_attr="prefetched_versions"))
-        return queryset
+        )
 
     def copy_language(self, request, object_id):
         target_language = request.POST.get("target_language")
@@ -338,18 +335,18 @@ def get_indicator_menu(cls, request, page_content):
 
 
 class VersioningCMSConfig(CMSAppConfig):
-    """Implement versioning for core cms models
-    """
+    """Implement versioning for core cms models"""
+
     cms_enabled = True
-    djangocms_versioning_enabled = getattr(
-        settings, "VERSIONING_CMS_MODELS_ENABLED", True
-    )
+    djangocms_versioning_enabled = getattr(settings, "VERSIONING_CMS_MODELS_ENABLED", True)
     versioning = [
         VersionableItem(
             content_model=PageContent,
             grouper_field_name="page",
             extra_grouping_fields=["language"],
-            version_list_filter_lookups={"language": get_language_tuple},
+            version_list_filter_lookups={
+                "language": lambda *args: get_language_tuple(site_id=get_current_site(args[0]).pk)
+            },
             copy_function=copy_page_content,
             grouper_selector_option_label=label_from_instance,
             on_publish=on_page_content_publish,

djangocms_versioning/cms_config.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from collections import OrderedDict
 from copy import copy
 

djangocms_versioning/cms_toolbars.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from collections.abc import Iterable
 from itertools import chain
 from typing import Any

djangocms_versioning/datastructures.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import copy
 import warnings
 from collections.abc import Iterable

djangocms_versioning/helpers.py

@@ -1,4 +1,3 @@
-
 from cms.utils.urlutils import admin_reverse
 from django.contrib.auth import get_permission_codename
 from django.db import models

djangocms_versioning/indicators.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.13 on 2018-06-12 12:21
-from __future__ import unicode_literals
 
 from django.db import migrations, models
 

djangocms_versioning/migrations/0001_initial.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.14 on 2018-07-24 12:42
-from __future__ import unicode_literals
 
 from django.db import migrations
 

djangocms_versioning/migrations/0002_delete_campaign.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11 on 2018-07-30 14:41
-from __future__ import unicode_literals
 
 from django.db import migrations, models
 import django.db.models.deletion

djangocms_versioning/migrations/0003_version.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.14 on 2018-07-30 10:35
-from __future__ import unicode_literals
 
 from django.conf import settings
 from django.db import migrations, models