django-cms · jrief · Feb 6, 2018 · Feb 6, 2018 · Feb 6, 2018 · Feb 6, 2018
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,22 +1,14 @@
-=== 3.5.3 (unreleased) ===
-
-* Fixed ``TreeNode.DoesNotExist`` exception raised when exporting
-  and loading database contents via ``dumpdata`` and ``loaddata``.
-* Fixed a bug where ``request.current_page`` would always be the public page,
-  regardless of the toolbar status (draft / live). This only affected custom
-  urls from an apphook.
-* Removed extra quotation mark from the sideframe button template
-* Fixed a bug where structureboard tried to preload markup when using legacy
-  renderer
-* Fixed a bug where updates on other tab are not correctly propagated if the
-  operation was to move a plugin in the top level of same placeholder
-* Fixed a bug where xframe options were processed by clickjacking middleware
-  when page was served from cache, rather then get this value from cache
-* Fixed a bug where cached page permissions overrides global permissions
-* Fixed a bug where plugins that are not rendered in content wouldn't be
-  editable in structure board
-* Fixed a bug with expanding static placeholder by clicking on "Expand All" button
-* Fixed rendering of permission icons. Use SVG variants instead of GIFs.
+=== 3.6.0 (unreleased) ===
+
+* Removed the ``cms moderator`` command.
+* Dropped Django < 1.11 support.
+* Removed the translatable content get / set methods from ``CMSPlugin`` model.
+* Removed signal handlers for ``Page``, ``Title``, ``Placeholder`` and ``CMSPlugin`` models.
+* Moved ``Title.meta_description`` length restriction from model to form
+  and increased its max length to 320 characters.
+* Added ``page_title`` parameter for ``cms.api.create_page()`` and ``cms.api.create_title()``.
+* Introduced Django 2.0 support.
+* Introduced Django 2.1 support.
 
 
 === 3.5.2 (2018-04-11) ===

diff --git a/README.rst b/README.rst
@@ -2,7 +2,7 @@
 django CMS
 ##########
 .. image:: https://travis-ci.org/divio/django-cms.svg?branch=develop
-    :target: http://travis-ci.org/divio/django-cms
+    :target: https://travis-ci.org/divio/django-cms
 .. image:: https://img.shields.io/pypi/v/django-cms.svg
     :target: https://pypi.python.org/pypi/django-cms/
 .. image:: https://img.shields.io/badge/wheel-yes-green.svg
@@ -48,17 +48,17 @@ Features
 
 Developing applications that integrate with and take advantage of django CMS features is easy and well-documented.
 
-More information on `our website <http://www.django-cms.org>`_.
+More information on `our website <https://www.django-cms.org>`_.
 
 ************
 Requirements
 ************
 
 See the `Python/Django requirements for the current release version
-<http://docs.django-cms.org/en/stable/#software-version-requirements-and-release-notes>`_ in our documentation.
+<http://docs.django-cms.org/en/latest/#software-version-requirements-and-release-notes>`_ in our documentation.
 
 See the `installation how-to guide for an overview of some other requirements and dependencies of the current release
-<http://docs.django-cms.org/en/stable/how-to/install.html>`_
+<http://docs.django-cms.org/en/latest/how_to/install.html>`_
 
 *************
 Documentation
@@ -71,7 +71,7 @@ We maintain documentation for several versions of the project. Key versions are:
 * `develop <http://docs.django-cms.org/en/develop/>`_, representing the latest build of the **develop branch**
 
 For more information about our branch policy, see `Branches
-<http://docs.django-cms.org/en/stable/contributing/development-policies.html>`_.
+<http://docs.django-cms.org/en/latest/contributing/development-policies.html>`_.
 
 Our documentation is hosted courtesy of `Read the Docs <https://readthedocs.org>`_.
 
@@ -122,7 +122,7 @@ Credits
 * Includes icons from `FamFamFam <http://www.famfamfam.com>`_.
 * Python tree engine powered by
   `django-treebeard <https://tabo.pe/projects/django-treebeard/>`_.
-* JavaScript tree in admin uses `jsTree <http://www.jstree.com>`_.
+* JavaScript tree in admin uses `jsTree <https://www.jstree.com>`_.
 * Many thanks to the
   `over 515 contributors <https://github.com/divio/django-cms/blob/develop/AUTHORS>`_
   to the django CMS!
diff --git a/cms/admin/forms.py b/cms/admin/forms.py
@@ -14,6 +14,7 @@
 
 from cms import api
 from cms.apphook_pool import apphook_pool
+from cms.cache.permissions import clear_permission_cache
 from cms.exceptions import PluginLimitReached
 from cms.extensions import extension_pool
 from cms.constants import PAGE_TYPES_ID, PUBLISHER_STATE_DIRTY, ROOT_USER_LEVEL
@@ -126,9 +127,9 @@ class BasePageForm(forms.ModelForm):
                                  help_text=_('Overwrites what is displayed at the top of your browser or in bookmarks'),
                                  required=False)
     meta_description = forms.CharField(label=_('Description meta tag'), required=False,
-                                       widget=forms.Textarea(attrs={'maxlength': '155', 'rows': '4'}),
+                                       widget=forms.Textarea(attrs={'maxlength': '320', 'rows': '4'}),
                                        help_text=_('A description of the page used by search engines.'),
-                                       max_length=155)
+                                       max_length=320)
 
     class Meta:
         model = Page
@@ -465,6 +466,7 @@ def save(self, commit=True):
             api.create_title(language=self._language, page=cms_page, **translation_data)
         else:
             cms_page._update_title_path_recursive(self._language)
+        cms_page.clear_cache(menu=True)
         return cms_page
 
 
@@ -474,6 +476,11 @@ class Meta:
         model = Page
         fields = ['publication_date', 'publication_end_date']
 
+    def save(self, *args, **kwargs):
+        page = super(PublicationDatesForm, self).save(*args, **kwargs)
+        page.clear_cache(menu=True)
+        return page
+
 
 class AdvancedSettingsForm(forms.ModelForm):
     from cms.forms.fields import PageSmartLinkField
@@ -499,7 +506,7 @@ class AdvancedSettingsForm(forms.ModelForm):
     redirect = PageSmartLinkField(label=_('Redirect'), required=False,
                                   help_text=_('Redirects to this URL.'),
                                   placeholder_text=_('Start typing...'),
-                                  ajax_view='admin:cms_page_get_published_pagelist'
+                                  ajax_view='admin:cms_page_get_published_pagelist',
     )
 
     # This is really a 'fake' field which does not correspond to any Page attribute
@@ -758,6 +765,7 @@ def save(self, *args, **kwargs):
 
         if is_draft_and_has_public and self.has_changed_apphooks():
             self.update_apphooks()
+        page.clear_cache(menu=True)
         return page
 
 
@@ -767,6 +775,12 @@ class Meta:
         model = Page
         fields = ['login_required', 'limit_visibility_in_menu']
 
+    def save(self, *args, **kwargs):
+        page = super(PagePermissionForm, self).save(*args, **kwargs)
+        page.clear_cache(menu=True)
+        clear_permission_cache()
+        return page
+
 
 class PageTreeForm(forms.Form):
 
@@ -825,6 +839,13 @@ def _get_tree_options_for_parent(self, parent_node, position):
 
 class MovePageForm(PageTreeForm):
 
+    def clean(self):
+        cleaned_data = super(MovePageForm, self).clean()
+
+        if self.page.is_home and cleaned_data.get('target'):
+            self.add_error('target', force_text(_('You can\'t move the home page inside another page')))
+        return cleaned_data
+
     def get_tree_options(self):
         options = super(MovePageForm, self).get_tree_options()
         target_node, target_node_position = options

diff --git a/cms/admin/pageadmin.py b/cms/admin/pageadmin.py
@@ -53,6 +53,7 @@
 )
 from cms.admin.permissionadmin import PERMISSION_ADMIN_INLINES
 from cms.admin.placeholderadmin import PlaceholderAdminMixin
+from cms.cache.permissions import clear_permission_cache
 from cms.constants import PUBLISHER_STATE_PENDING
 from cms.models import (
     EmptyTitle, Page, PageType,
@@ -72,6 +73,7 @@
     get_site_language_from_request,
 )
 from cms.utils.admin import jsonify_request
+from cms.utils.compat import DJANGO_2_0
 from cms.utils.conf import get_cms_setting
 from cms.utils.urlutils import admin_reverse
 
@@ -441,8 +443,19 @@ def delete_view(self, request, object_id, extra_context=None):
         # Populate deleted_objects, a data structure of all related objects that
         # will also be deleted.
         objs = [obj] + list(obj.get_descendant_pages())
+
+        if DJANGO_2_0:
+            get_deleted_objects_additional_kwargs = {
+                'opts': opts,
+                'using': using,
+                'user': request.user,
+            }
+        else:
+            get_deleted_objects_additional_kwargs = {'request': request}
         (deleted_objects, model_count, perms_needed, protected) = get_deleted_objects(
-            objs, opts, request.user, self.admin_site, using)
+            objs, admin_site=self.admin_site,
+            **get_deleted_objects_additional_kwargs
+        )
 
         if request.POST and not protected:  # The user has confirmed the deletion.
             if perms_needed:
@@ -486,6 +499,19 @@ def delete_model(self, request, obj):
             obj=obj,
         )
 
+        cms_pages = [obj]
+
+        if obj.publisher_public:
+            cms_pages.append(obj.publisher_public)
+
+        if obj.node.is_branch:
+            nodes = obj.node.get_descendants()
+            cms_pages.extend(self.model.objects.filter(node__in=nodes))
+
+        for page in cms_pages:
+            page._clear_placeholders()
+            page.get_placeholders().delete()
+
         super(BasePageAdmin, self).delete_model(request, obj)
 
         self._send_post_page_operation(
@@ -495,6 +521,11 @@ def delete_model(self, request, obj):
             obj=obj,
         )
 
+        clear_permission_cache()
+
+        if obj.application_urls:
+            set_restart_trigger()
+
     def get_copy_dialog(self, request, page_id):
         if not get_cms_setting('PERMISSION'):
             return HttpResponse('')
@@ -644,6 +675,9 @@ def has_change_permission(self, request, obj=None):
         )
         return can_change_page
 
+    def has_view_permission(self, request, obj=None):
+        return self.has_change_permission(request, obj)
+
     def has_change_advanced_settings_permission(self, request, obj=None):
         if not obj:
             return False
@@ -1251,22 +1285,24 @@ def delete_translation(self, request, object_id, extra_context=None):
         pluginopts = CMSPlugin._meta
 
         saved_plugins = CMSPlugin.objects.filter(placeholder__page__id=object_id, language=language)
-
         using = router.db_for_read(self.model)
-        kwargs = {
-            'admin_site': self.admin_site,
-            'user': request.user,
-            'using': using
-        }
 
+        kwargs = {'admin_site': self.admin_site}
+        if DJANGO_2_0:
+            kwargs.update({'using': using, 'opts': titleopts, 'user': request.user})
+        else:
+            kwargs.update({'request': request})
         deleted_objects, __, perms_needed = get_deleted_objects(
             [translation],
-            titleopts,
             **kwargs
         )[:3]
+
+        if DJANGO_2_0:
+            kwargs.update({'using': using, 'opts': pluginopts, 'user': request.user})
+        else:
+            kwargs.update({'request': request})
         to_delete_plugins, __, perms_needed_plugins = get_deleted_objects(
             saved_plugins,
-            pluginopts,
             **kwargs
         )[:3]
 

diff --git a/cms/admin/permissionadmin.py b/cms/admin/permissionadmin.py
@@ -12,7 +12,7 @@
 from cms.admin.forms import GlobalPagePermissionAdminForm, PagePermissionInlineAdminForm, ViewRestrictionInlineAdminForm
 from cms.exceptions import NoPermissionsException
 from cms.models import PagePermission, GlobalPagePermission
-from cms.utils import permissions
+from cms.utils import permissions, page_permissions
 from cms.utils.conf import get_cms_setting
 from cms.utils.helpers import classproperty
 
@@ -38,6 +38,18 @@ class PagePermissionInlineAdmin(TabularInline):
     extra = 0  # edit page load time boost
     show_with_view_permissions = False
 
+    def has_change_permission(self, request, obj=None):
+        if not obj:
+            return False
+        return page_permissions.user_can_change_page_permissions(
+            request.user,
+            page=obj,
+            site=obj.node.site,
+        )
+
+    def has_add_permission(self, request, obj=None):
+        return self.has_change_permission(request, obj)
+
     @classproperty
     def raw_id_fields(cls):
         # Dynamically set raw_id_fields based on settings