From b60c521e8b6f4e26e745679c2c684e41851f77fb Mon Sep 17 00:00:00 2001
From: Rafael Monnerat <rafael@nexedi.com>
Date: Wed, 21 Feb 2024 18:55:54 +0000
Subject: [PATCH] erp5_calendar: Associate constraint only over the test
method.
---
.../test.erp5.testCalendar.py | 2 ++
.../test.erp5.testCalendar.xml | 27 +++----------------
.../template_portal_type_property_sheet_list | 1 -
3 files changed, 5 insertions(+), 25 deletions(-)
diff --git a/bt5/erp5_calendar/TestTemplateItem/portal_components/test.erp5.testCalendar.py b/bt5/erp5_calendar/TestTemplateItem/portal_components/test.erp5.testCalendar.py
index 4227225482..a646eb628f 100644
--- a/bt5/erp5_calendar/TestTemplateItem/portal_components/test.erp5.testCalendar.py
+++ b/bt5/erp5_calendar/TestTemplateItem/portal_components/test.erp5.testCalendar.py
@@ -85,6 +85,7 @@ class TestCalendar(ERP5ReportTestCase):
self.category_tool = self.getCategoryTool()
self.createCategories()
self.createService()
+
# activate constraints
self._addPropertySheet('Group Calendar', 'CalendarConstraint')
self._addPropertySheet('Presence Request', 'CalendarConstraint')
@@ -94,6 +95,7 @@ class TestCalendar(ERP5ReportTestCase):
self._addPropertySheet('Leave Request', 'IndividualCalendarConstraint')
self._addPropertySheet('Leave Request Period', 'CalendarPeriodConstraint')
+ self._addPropertySheet('Leave Request Period', 'LeaveRequestPeriodConstraint')
self._addPropertySheet('Presence Request Period', 'CalendarPeriodConstraint')
self._addPropertySheet('Group Presence Period', 'CalendarPeriodConstraint')
diff --git a/bt5/erp5_calendar/TestTemplateItem/portal_components/test.erp5.testCalendar.xml b/bt5/erp5_calendar/TestTemplateItem/portal_components/test.erp5.testCalendar.xml
index 481090e25d..d232b660b4 100644
--- a/bt5/erp5_calendar/TestTemplateItem/portal_components/test.erp5.testCalendar.xml
+++ b/bt5/erp5_calendar/TestTemplateItem/portal_components/test.erp5.testCalendar.xml
@@ -6,12 +6,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>_recorded_property_dict</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>testCalendar</string> </value>
@@ -59,28 +53,13 @@
<item>
<key> <string>workflow_history</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <global name="PersistentMapping" module="Persistence.mapping"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
@@ -93,7 +72,7 @@
<item>
<key> <string>component_validation_workflow</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
@@ -102,7 +81,7 @@
</dictionary>
</pickle>
</record>
- <record id="4" aka="AAAAAAAAAAQ=">
+ <record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle>
diff --git a/bt5/erp5_calendar/bt/template_portal_type_property_sheet_list b/bt5/erp5_calendar/bt/template_portal_type_property_sheet_list
index e1304925b5..1593344b69 100644
--- a/bt5/erp5_calendar/bt/template_portal_type_property_sheet_list
+++ b/bt5/erp5_calendar/bt/template_portal_type_property_sheet_list
@@ -1,4 +1,3 @@
-Leave Request Period | LeaveRequestPeriodConstraint
Leave Request | LeaveRequest
Presence Request | PresenceRequest
System Preference | CalendarPreference
\ No newline at end of file
--
GitLab