Merge pull request #3 from maykinmedia/feature/1234-correct-page-content

Feature/1234 correct page content

Author: alextreme

changes/1234.feature

@@ -0,0 +1 @@
+fix toolbar page content

cms_helper.py

@@ -19,6 +19,7 @@ def gettext(s):
         "taggit",
         "taggit_autosuggest",
         "meta",
+        "djangocms_versioning",
         # "djangocms_page_tags",
         "tests.test_utils",
     ],

djangocms_page_meta/cms_toolbars.py

@@ -1,20 +1,16 @@
 from cms.cms_toolbars import PAGE_MENU_SECOND_BREAK
+from cms.models import PageContent
 from cms.toolbar.items import Break
 from cms.toolbar_base import CMSToolbar
 from cms.toolbar_pool import toolbar_pool
+from cms.utils.conf import get_cms_setting
 from cms.utils.i18n import get_language_list, get_language_object
 from cms.utils.permissions import has_page_permission
 from django.urls import NoReverseMatch, reverse
 from django.utils.translation import gettext_lazy as _
 
 from .models import DefaultMetaImage, PageMeta, TitleMeta
 
-try:
-    from cms.utils import get_cms_setting
-except ImportError:
-    from cms.utils.conf import get_cms_setting
-
-
 PAGE_META_MENU_TITLE = _("Meta-information")
 PAGE_META_ITEM_TITLE = _("Common")
 PAGE_META_DEFAULT_META_IMAGE_TITLE = _("Default meta image")
@@ -23,8 +19,6 @@
 @toolbar_pool.register
 class PageToolbarMeta(CMSToolbar):
     def populate(self):
-        # always use draft if we have a page
-        # self.page = get_page_draft(self.request.current_page)
         self.page = self.request.current_page
         if not self.page:
             # Nothing to do
@@ -41,10 +35,9 @@ def populate(self):
         else:
             has_global_current_page_change_permission = False
             # check if user has page edit permission
-        permission = self.request.current_page.has_change_permission(self.request.user)
-        can_change = self.request.current_page and permission
+        permission = self.page.has_change_permission(self.request.user)
+        can_change = self.page and permission
         if has_global_current_page_change_permission or can_change:
-            not_edit_mode = not self.toolbar.edit_mode_active
 
             current_page_menu = self.toolbar.get_or_create_menu("page")
             super_item = current_page_menu.find_first(Break, identifier=PAGE_MENU_SECOND_BREAK)
@@ -76,30 +69,34 @@ def populate(self):
                 # not in urls
                 pass
             else:
-                meta_menu.add_modal_item(PAGE_META_ITEM_TITLE, url=url, disabled=not_edit_mode, position=position)
-            # Title tags
+                meta_menu.add_modal_item(PAGE_META_ITEM_TITLE, url=url, position=position)
+            # Content tags
             site_id = self.page.node.site_id
-            titles = self.page.pagecontent_set.filter(language__in=get_language_list(site_id))
 
+            contents = PageContent.admin_manager.filter(
+                page=self.page, language__in=get_language_list(site_id)
+            ).current_content()
+
+            # TODO: rename to content extensions
             title_extensions = {
                 t.extended_object_id: t
-                for t in TitleMeta.objects.filter(extended_object_id__in=[title.id for title in titles])
+                for t in TitleMeta.objects.filter(extended_object_id__in=[content.id for content in contents])
             }
 
-            for title in titles:
+            for content in contents:
                 try:
-                    if title.pk in title_extensions:
+                    if content.pk in title_extensions:
                         url = reverse(
-                            "admin:djangocms_page_meta_titlemeta_change", args=(title_extensions[title.pk].pk,)
+                            "admin:djangocms_page_meta_titlemeta_change", args=(title_extensions[content.pk].pk,)
                         )
                     else:
                         url = "{}?extended_object={}".format(
-                            reverse("admin:djangocms_page_meta_titlemeta_add"), title.pk
+                            reverse("admin:djangocms_page_meta_titlemeta_add"), content.pk
                         )
                 except NoReverseMatch:
                     # not in urls
                     pass
                 else:
                     position += 1
-                    language = get_language_object(title.language)
-                    meta_menu.add_modal_item(language["name"], url=url, disabled=not_edit_mode, position=position)
+                    language = get_language_object(content.language)
+                    meta_menu.add_modal_item(language["name"], url=url, position=position)

djangocms_page_meta/models.py

@@ -24,6 +24,8 @@
 except ImportError:
     registry = None
 
+from djangocms_versioning.constants import INDICATOR_DESCRIPTIONS
+
 
 class PageMeta(PageExtension):
     image = FilerFileField(
@@ -127,8 +129,12 @@ class Meta:
         verbose_name = _("Page meta info (language-dependent)")
         verbose_name_plural = _("Page meta info (language-dependent)")
 
+    def get_version_status(self):
+        state = self.extended_object.versions.first().state
+        return INDICATOR_DESCRIPTIONS[state]
+
     def __str__(self):
-        return _("Title Meta for {0}").format(self.extended_object)
+        return _("Page Content Meta for {0}").format(self.extended_object) + f": {self.get_version_status()}"
 
     @property
     def locale(self):

djangocms_page_meta/utils.py

@@ -1,3 +1,4 @@
+from cms.models import PageContent
 from django.template.loader import render_to_string
 from django.utils.safestring import mark_safe
 from django.utils.translation import get_language_from_request
@@ -39,7 +40,7 @@ def get_page_meta(page, language):
     meta = cache.get(meta_key)
     if not meta:
         meta = Meta()
-        title = page.get_content_obj(language)
+        title = PageContent.admin_manager.filter(page=page, language=language).current_content().get()
         default_meta_image = DefaultMetaImage.objects.first().image
         meta.extra_custom_props = []
 

setup.cfg

@@ -33,6 +33,7 @@ install_requires =
 	django-cms~=4.1
 	django-meta>=2.4.0
 	django-filer>=3.0
+    djangocms-versioning>=2
 setup_requires =
 	setuptools
 packages = djangocms_page_meta

tests/base.py

@@ -3,6 +3,7 @@
 
 from app_helper.base_test import CreateTestDataMixin
 from cms.api import create_page, create_page_content
+from cms.models import PageContent
 from cms.test_utils.testcases import CMSTestCase
 from django.contrib.auth.models import Permission
 from django.core.cache import cache
@@ -90,12 +91,14 @@ def create_pages(self):
 
             main_data = deepcopy(page_data[self.language])
             main_data["language"] = self.language
+            main_data["created_by"] = self.superuser
             page = create_page(**main_data)
 
             for lang in self.languages[1:]:
                 context_data = deepcopy(page_data[lang])
                 context_data["language"] = lang
                 context_data["page"] = page
+                context_data["created_by"] = self.superuser
                 create_page_content(**context_data)
 
             if not home_set:
@@ -118,3 +121,8 @@ def _add_default_permissions(self, user):
     def create_filer_image_object(self):
         self.filer_image = self.create_filer_image(self.staff_user, self.image_name)
         return self.filer_image
+
+    def publish_page(self, page, language):
+        content = PageContent.admin_manager.get(page=page, language=language)
+        version = content.versions.first()
+        version.publish(self.superuser)

tests/test_general.py

@@ -1,8 +1,10 @@
+from cms.models import PageContent
 from django.conf import settings
 from django.core.cache import cache
 from django.template.base import Parser
 from django.test import override_settings
 from django.utils.functional import SimpleLazyObject
+from djangocms_versioning.constants import INDICATOR_DESCRIPTIONS
 
 from djangocms_page_meta import models
 from djangocms_page_meta.forms import PageMetaAdminForm, TitleMetaAdminForm
@@ -182,7 +184,8 @@ def test_custom_extra(self):
         page1 = self.create_pages()[0]
         page_meta = models.PageMeta.objects.create(extended_object=page1)
         page_meta.save()
-        title_meta = models.TitleMeta.objects.create(extended_object=page1.get_content_obj("en"))
+        content = PageContent.admin_manager.get(page=page1, language="en")
+        title_meta = models.TitleMeta.objects.create(extended_object=content)
         title_meta.save()
 
         models.GenericMetaAttribute.objects.create(page=page_meta, attribute="custom", name="attr", value="foo")
@@ -196,37 +199,41 @@ def test_custom_extra(self):
         meta = get_page_meta(page1, "it")
         self.assertEqual(meta.extra_custom_props, [("custom", "attr", "foo")])
 
-    # def test_publish_extra(self):
-    #     """
-    #     Test that modified GenericMetaAttribute are not copied multiple times on page publish
-    #     See issue #78
-    #     """
-    #     page1 = self.create_pages()[0]
-    #     page_meta = models.PageMeta.objects.create(extended_object=page1)
-    #     title_meta = models.TitleMeta.objects.create(extended_object=page1.get_content_obj("en"))
-    #     models.GenericMetaAttribute.objects.create(page=page_meta, attribute="custom", name="attr", value="foo")
-    #     models.GenericMetaAttribute.objects.create(title=title_meta, attribute="custom", name="attr", value="bar")
-    #
-    #     page1.publish("en")
-    #     page_meta.extra.first().attribute = "new"
-    #     page_meta.extra.first().save()
-    #     title_meta.extra.first().attribute = "new"
-    #     title_meta.extra.first().save()
-    #
-    #     page1.publish("en")
-    #     public = page1.get_public_object()
-    #     page_meta = models.PageMeta.objects.get(extended_object=public)
-    #     title_meta = models.TitleMeta.objects.get(extended_object=public.get_content_obj("en"))
-    #     self.assertEqual(page_meta.extra.count(), 1)
-    #     self.assertEqual(title_meta.extra.count(), 1)
+    def test_publish_extra(self):
+        """
+        Test that modified GenericMetaAttribute are not copied multiple times on page publish
+        See issue #78
+        """
+        page1 = self.create_pages()[0]
+        page_meta = models.PageMeta.objects.create(extended_object=page1)
+        content = PageContent.admin_manager.get(page=page1, language="en")
+        title_meta = models.TitleMeta.objects.create(extended_object=content)
+        models.GenericMetaAttribute.objects.create(page=page_meta, attribute="custom", name="attr", value="foo")
+        models.GenericMetaAttribute.objects.create(title=title_meta, attribute="custom", name="attr", value="bar")
+
+        version = content.versions.first()
+        version.publish(self.superuser)
+        page_meta.extra.first().attribute = "new"
+        page_meta.extra.first().save()
+        title_meta.extra.first().attribute = "new"
+        title_meta.extra.first().save()
+
+        new_version = version.copy(self.superuser)
+        new_version.publish(self.superuser)
+        public = page1  # page no longer versioned
+        page_meta = models.PageMeta.objects.get(extended_object=public)
+        title_meta = models.TitleMeta.objects.get(extended_object=public.get_content_obj("en"))
+        self.assertEqual(page_meta.extra.count(), 1)
+        self.assertEqual(title_meta.extra.count(), 1)
 
     def test_str_methods(self):
         """
         Models str are created
         """
         page1 = self.create_pages()[0]
         page_meta = models.PageMeta.objects.create(extended_object=page1)
-        title_meta = models.TitleMeta.objects.create(extended_object=page1.get_content_obj("en"))
+        content = PageContent.admin_manager.get(page=page1, language="en")
+        title_meta = models.TitleMeta.objects.create(extended_object=content)
         default_meta_image = models.DefaultMetaImage.objects.first()
         page_attr = models.GenericMetaAttribute.objects.create(
             page=page_meta, attribute="custom", name="attr", value="foo"
@@ -236,7 +243,7 @@ def test_str_methods(self):
         )
 
         self.assertEqual(str(page_meta), f"Page Meta for {page1}")
-        self.assertEqual(str(title_meta), f"Title Meta for {page1.get_content_obj('en')}")
+        self.assertEqual(str(title_meta), f"Page Content Meta for {content}: {INDICATOR_DESCRIPTIONS['draft']}")
         self.assertEqual(str(default_meta_image), f"{default_meta_image.pk}")
         self.assertEqual(str(page_attr), f"Attribute {page_attr.name} for {page_meta}")
         self.assertEqual(str(title_attr), f"Attribute {title_attr.name} for {title_meta}")
@@ -258,7 +265,8 @@ def test_cache_cleanup_on_update_delete_meta(self):
         """
         page1 = self.create_pages()[0]
         page_meta = models.PageMeta.objects.create(extended_object=page1)
-        title_meta = models.TitleMeta.objects.create(extended_object=page1.get_content_obj("en"))
+        content = PageContent.admin_manager.get(page=page1, language="en")
+        title_meta = models.TitleMeta.objects.create(extended_object=content)
 
         # cache objects
         for language in page1.get_languages():
@@ -299,7 +307,8 @@ def test_cache_cleanup_on_update_delete_page(self):
         """
         page1 = self.create_pages()[0]
         page_meta = models.PageMeta.objects.create(extended_object=page1)
-        title_meta = models.TitleMeta.objects.create(extended_object=page1.get_content_obj("en"))
+        content = PageContent.admin_manager.get(page=page1, language="en")
+        title_meta = models.TitleMeta.objects.create(extended_object=content)
 
         # cache objects - cache keys must be pre calculated as the page will not exist anymore when running the
         # asserts