django-cms · czpython · Jul 2, 2018 · Jun 15, 2018 · Jun 18, 2018 · Jun 18, 2018
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,
+)
 from cms.plugin_pool import plugin_pool
 from cms.signals.apphook import set_restart_trigger
 from cms.utils.conf import get_cms_setting
@@ -36,6 +41,9 @@
 )
 from menus.menu_pool import menu_pool
 
+# FIXME: REMOVEME:
+from attrdict import AttrDict
+
 
 def get_permission_accessor(obj):
     User = get_user_model()
@@ -131,6 +139,9 @@ class BasePageForm(forms.ModelForm):
                                        help_text=_('A description of the page used by search engines.'),
                                        max_length=320)
 
+    # FIXME: REMOVEME: Waiting for request to be passed through, temp hack for testing in the UI
+    request = AttrDict({'user': {'pk': 1 }})
+
     class Meta:
        model = Page
         fields = []
@@ -261,6 +272,11 @@ 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,
+            operation=ADD_PAGE_TRANSLATION,
+        )
+
         if source:
             new_page = self.from_source(source, parent=parent)
 
@@ -294,6 +310,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,
+            operation=ADD_PAGE_TRANSLATION,
+            token=operation_token,
+            obj=new_page,
+        )
+
         return new_page
 
 
@@ -443,6 +467,12 @@ def clean(self):
         return data
 
     def save(self, commit=True):
+
+        operation_token = operation_helpers.send_pre_page_operation(
+            request=self.request,
+            operation=CHANGE_PAGE,
+        )
+
         data = self.cleaned_data
         cms_page = super(ChangePageForm, self).save(commit=False)
 
@@ -467,6 +497,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,
+            operation=CHANGE_PAGE,
+            token=operation_token,
+            obj=cms_page,
+        )
+
         return cms_page
 
 

diff --git a/cms/admin/pageadmin.py b/cms/admin/pageadmin.py
@@ -3,15 +3,13 @@
 import copy
 import json
 import sys
-import uuid
-
 
 import django
 from django.contrib.admin.helpers import AdminForm
 from django.conf import settings
 from django.conf.urls import url
 from django.contrib import admin, messages
-from django.contrib.admin.models import LogEntry, CHANGE
+from django.contrib.admin.models import LogEntry
 from django.contrib.admin.options import IS_POPUP_VAR
 from django.contrib.admin.utils import get_deleted_objects
 from django.contrib.contenttypes.models import ContentType
@@ -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
@@ -120,6 +118,18 @@ class BasePageAdmin(PlaceholderAdminMixin, admin.ModelAdmin):
 
     inlines = PERMISSION_ADMIN_INLINES
 
+    def log_addition(self, request, object, object_repr):
+        # Block the admin log for addition. A signal takes care of this!
+        return
+
+    def log_deletion(self, request, object, object_repr):
+        # Block the admin log for deletion. A signal takes care of this!
+        return
+
+    def log_change(self, request, object, message):
+        # Block the admin log for change. A signal takes care of this!
+        return
+
     def get_admin_url(self, action, *args):
         url_name = "{}_{}_{}".format(
             self.opts.app_label,
@@ -200,22 +210,18 @@ 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
         )
 
@@ -900,6 +906,7 @@ def move_page(self, request, page_id, extra_context=None):
             token=operation_token,
             obj=page,
         )
+
         return jsonify_request(HttpResponse(status=200))
 
     def get_permissions(self, request, page_id):
@@ -1153,13 +1160,6 @@ def publish_page(self, request, page_id, language):
                     messages.warning(request, _("Page not published! A parent page is not published yet."))
                 else:
                     messages.info(request, _('The content was successfully published.'))
-                LogEntry.objects.log_action(
-                    user_id=request.user.id,
-                    content_type_id=ContentType.objects.get_for_model(Page).pk,
-                    object_id=page_id,
-                    object_repr=page.get_title(language),
-                    action_flag=CHANGE,
-                )
             else:
                 if page.get_publisher_state(language) == PUBLISHER_STATE_PENDING:
                     messages.warning(request, _("Page not published! A parent page is not published yet."))
@@ -1222,14 +1222,7 @@ def unpublish(self, request, page_id, language):
             message = _('The %(language)s page "%(page)s" was successfully unpublished') % {
                 'language': language_name, 'page': page}
             messages.info(request, message)
-            LogEntry.objects.log_action(
-                user_id=request.user.id,
-                content_type_id=ContentType.objects.get_for_model(Page).pk,
-                object_id=page_id,
-                object_repr=page.get_title(),
-                action_flag=CHANGE,
-                change_message=message,
-            )
+
         except RuntimeError:
             exc = sys.exc_info()[1]
             messages.error(request, exc.message)
@@ -1614,7 +1607,24 @@ class Meta:
         if not cancel_clicked and request.method == 'POST':
             form = PageTitleForm(instance=translation, data=request.POST)
             if form.is_valid():
+
+                operation_token = self._send_pre_page_operation(
+                    request,
+                    operation=operations.CHANGE_PAGE_TRANSLATION,
+                    obj=page,
+                    translation=translation,
+                )
+
                 form.save()
+
+                self._send_post_page_operation(
+                    request,
+                    operation=operations.CHANGE_PAGE_TRANSLATION,
+                    token=operation_token,
+                    obj=page,
+                    translation=translation,
+                )
+
                 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
@@ -13,10 +13,13 @@
 CLEAR_PLACEHOLDER = 'clear_placeholder'
 
 # Page operations
+CHANGE_PAGE = 'change_page'
 MOVE_PAGE = 'move_page'
 DELETE_PAGE = 'delete_page'
 
 # Page translation operations
+ADD_PAGE_TRANSLATION = 'add_page_translation'
+CHANGE_PAGE_TRANSLATION = 'change_page_translation'
 DELETE_PAGE_TRANSLATION = 'delete_page_translation'
 PUBLISH_PAGE_TRANSLATION = 'publish_page_translation'
 REVERT_PAGE_TRANSLATION_TO_LIVE = 'revert_page_translation_to_live'

diff --git a/cms/operations/helpers.py b/cms/operations/helpers.py
@@ -0,0 +1,27 @@
+# -*- 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, operation, sender=Page, **kwargs):
+    token = str(uuid.uuid4())
+    pre_obj_operation.send(
+        sender=sender,
+        operation=operation,
+        request=request,
+        token=token,
+        **kwargs
+    )
+    return token
+
+
+def send_post_page_operation(request, operation, token, sender=Page, **kwargs):
+    post_obj_operation.send(
+        sender=sender,
+        operation=operation,
+        request=request,
+        token=token,
+        **kwargs
+    )
diff --git a/cms/signals/__init__.py b/cms/signals/__init__.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from cms.signals.apphook import debug_server_restart, trigger_server_restart
+from cms.signals.log_entries import log_page_operations, log_placeholder_operations
 from cms.signals.permissions import post_save_user, post_save_user_group, pre_save_user, pre_delete_user, pre_save_group, pre_delete_group, pre_save_pagepermission, pre_delete_pagepermission, pre_save_globalpagepermission, pre_delete_globalpagepermission
 from cms.utils.conf import get_cms_setting
 
@@ -78,6 +79,13 @@
     dispatch_uid='aldryn-apphook-reload-handle-urls-need-reloading'
 )
 
+
+###################### log entries #######################
+
+
+post_obj_operation.connect(log_page_operations)
+post_placeholder_operation.connect(log_placeholder_operations)
+
 ###################### permissions #######################
 
 if get_cms_setting('PERMISSION'):