Prepare for the form signal handler via operations. Failing tests.

django-cms · czpython · Jul 2, 2018 · Jun 15, 2018 · Jun 18, 2018 · Jun 18, 2018
commit 6ccfb02820f55c7b53ffeaab662c71c6a763cb84
diff --git a/cms/admin/forms.py b/cms/admin/forms.py
@@ -23,6 +23,11 @@
 from cms.models import (CMSPlugin, Page, PageType, PagePermission, PageUser, PageUserGroup, Title,
                         Placeholder, GlobalPagePermission, TreeNode)
 from cms.models.permissionmodels import User
+from cms.operations import (
+    helpers as operation_helpers,
+    ADD_PAGE_TRANSLATION,
+    CHANGE_PAGE_TRANSLATION,
+)
 from cms.plugin_pool import plugin_pool
 from cms.signals.apphook import set_restart_trigger
 from cms.utils.conf import get_cms_setting
@@ -261,6 +266,12 @@ def save(self, *args, **kwargs):
         source = self.cleaned_data.get('source')
         parent = self.cleaned_data.get('parent_node')
 
+        operation_token = operation_helpers.send_pre_page_operation(
+            request=self.request,
+            sender=self.model,
+            operation=ADD_PAGE_TRANSLATION,
+        )
+
         if source:
             new_page = self.from_source(source, parent=parent)
 
@@ -294,6 +305,14 @@ def save(self, *args, **kwargs):
             # its the first page. publish it right away
             new_page.publish(translation.language)
             new_page.set_as_homepage(self._user)
+
+            operation_helpers.send_post_page_operation(
+                request=self.request,
+                sender=self.model,
+                operation=ADD_PAGE_TRANSLATION,
+                token=operation_token,
+            )
+
         return new_page
 
 
@@ -443,6 +462,13 @@ def clean(self):
         return data
 
     def save(self, commit=True):
+
+        operation_token = operation_helpers.send_pre_page_operation(
+            request=self.request,
+            sender=self.model,
+            operation=CHANGE_PAGE_TRANSLATION
+        )
+
         data = self.cleaned_data
         cms_page = super(ChangePageForm, self).save(commit=False)
 
@@ -467,6 +493,14 @@ def save(self, commit=True):
         else:
             cms_page._update_title_path_recursive(self._language)
         cms_page.clear_cache(menu=True)
+
+        operation_helpers.send_post_page_operation(
+            request=self.request,
+            sender=self.model,
+            operation=CHANGE_PAGE_TRANSLATION,
+            token=operation_token
+        )
+
         return cms_page
 
 

diff --git a/cms/admin/pageadmin.py b/cms/admin/pageadmin.py
@@ -3,8 +3,6 @@
 import copy
 import json
 import sys
-import uuid
-
 
 import django
 from django.contrib.admin.helpers import AdminForm
@@ -60,8 +58,8 @@
     Title, CMSPlugin, PagePermission,
     GlobalPagePermission, StaticPlaceholder,
 )
+from cms.operations.helpers import send_post_page_operation, send_pre_page_operation
 from cms.plugin_pool import plugin_pool
-from cms.signals import pre_obj_operation, post_obj_operation
 from cms.signals.apphook import set_restart_trigger
 from cms.toolbar_pool import toolbar_pool
 from cms.utils import permissions, get_current_site, get_language_from_request, copy_plugins
@@ -76,6 +74,7 @@
 from cms.utils.conf import get_cms_setting
 from cms.utils.urlutils import admin_reverse
 
+
 require_POST = method_decorator(require_POST)
 
 
@@ -212,22 +211,19 @@ def get_urls(self):
         return url_patterns + super(BasePageAdmin, self).get_urls()
 
     def _send_pre_page_operation(self, request, operation, **kwargs):
-        token = str(uuid.uuid4())
-        pre_obj_operation.send(
-            sender=self.__class__,
-            operation=operation,
+
+        return send_pre_page_operation(
             request=request,
-            token=token,
-            **kwargs
-        )
-        return token
+            operation=operation,
+            sender=self.__class__,
+            **kwargs)
 
     def _send_post_page_operation(self, request, operation, token, **kwargs):
-        post_obj_operation.send(
-            sender=self.__class__,
+        send_post_page_operation(
             operation=operation,
             request=request,
             token=token,
+            sender=self.__class__,
             **kwargs
         )
 
@@ -493,6 +489,7 @@ def delete_view(self, request, object_id, extra_context=None):
         return self.render_delete_form(request, context)
 
     def delete_model(self, request, obj):
+
         operation_token = self._send_pre_page_operation(
             request,
             operation=operations.DELETE_PAGE,
@@ -1613,11 +1610,7 @@ class Meta:
         if not cancel_clicked and request.method == 'POST':
             form = PageTitleForm(instance=translation, data=request.POST)
             if form.is_valid():
-
-
                 form.save()
-
-
                 saved_successfully = True
         else:
             form = PageTitleForm(instance=translation)

diff --git a/cms/operations.py → cms/operations/__init__.py b/cms/operations.py → cms/operations/__init__.py
diff --git a/cms/operations/helpers.py b/cms/operations/helpers.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+import uuid
+
+from cms.models import Page
+from cms.signals import pre_obj_operation, post_obj_operation
+
+
+def send_pre_page_operation(request, sender, operation, obj=Page, **kwargs):
+    token = str(uuid.uuid4())
+    pre_obj_operation.send(
+        sender=sender,
+        operation=operation,
+        request=request,
+        token=token,
+        obj=obj,
+        **kwargs
+    )
+    return token
+
+
+def send_post_page_operation(request, sender, operation, token, obj=Page, **kwargs):
+    post_obj_operation.send(
+        sender=sender,
+        operation=operation,
+        request=request,
+        token=token,
+        obj=obj,
+        **kwargs
+    )