From c94277257de3e84e72874d64666bdcee9d4f1984 Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Fri, 13 Dec 2019 16:52:31 +0100
Subject: [PATCH 1/2] Enable Auditlogging for Dexterity Contents

---
 bika/lims/subscribers/configure.zcml | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/bika/lims/subscribers/configure.zcml b/bika/lims/subscribers/configure.zcml
index 80c75c1c55..e39cb3bc71 100644
--- a/bika/lims/subscribers/configure.zcml
+++ b/bika/lims/subscribers/configure.zcml
@@ -11,20 +11,34 @@
       handler=".objectadded.auto_generate_id"
       />
 
-  <!-- Audit Log: Object Created -->
+  <!-- Audit Log: AT Object Created -->
   <subscriber
-      for="*
+      for="Products.Archetypes.interfaces.IBaseObject
            Products.Archetypes.interfaces.IObjectInitializedEvent"
       handler=".auditlog.ObjectInitializedEventHandler"
       />
 
-  <!-- Audit Log: Object Modified -->
+  <!-- Audit Log: Dexterity Object Created -->
   <subscriber
-      for="*
+      for="plone.dexterity.interfaces.IDexterityContent
+           zope.lifecycleevent.interfaces.IObjectAddedEvent"
+      handler=".auditlog.ObjectInitializedEventHandler"
+      />
+
+  <!-- Audit Log: AT Object Modified -->
+  <subscriber
+      for="Products.Archetypes.interfaces.IBaseObject
            Products.Archetypes.interfaces.IObjectEditedEvent"
       handler=".auditlog.ObjectModifiedEventHandler"
       />
 
+  <!-- Audit Log: Dexterity Object Modified -->
+  <subscriber
+      for="plone.dexterity.interfaces.IDexterityContent
+           zope.lifecycleevent.interfaces.IObjectModifiedEvent"
+      handler=".auditlog.ObjectModifiedEventHandler"
+      />
+
   <!-- Audit Log: After Transition Event -->
   <subscriber
       for="*

From a5dec40e5cedb7e010be20dae45add450077f8ad Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Fri, 13 Dec 2019 16:55:17 +0100
Subject: [PATCH 2/2] Changelog updated

---
 CHANGES.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index eb32a383bf..d321caedfd 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -7,6 +7,7 @@ Changelog
 
 **Added**
 
+- #1491 Enable Audit-logging for Dexterity Contents
 - #1481 Filter Templates field when Sample Type is selected in Sample Add form
 - #1483 Added Accredited symbol in Analyses listings
 - #1466 Support for "readonly" and "hidden" visibility modes in ReferenceWidget