diff --git a/bt5/erp5_calendar/DocumentTemplateItem/portal_components/document.erp5.GroupCalendarAssignment.py b/bt5/erp5_calendar/DocumentTemplateItem/portal_components/document.erp5.GroupCalendarAssignment.py index 3d27bb3a8494c303bb35cf9898979a5d3361ce44..f139638b47ce0d29062122c0e46516abda874fc6 100644 --- a/bt5/erp5_calendar/DocumentTemplateItem/portal_components/document.erp5.GroupCalendarAssignment.py +++ b/bt5/erp5_calendar/DocumentTemplateItem/portal_components/document.erp5.GroupCalendarAssignment.py @@ -27,6 +27,7 @@ from AccessControl import ClassSecurityInfo from Products.ERP5Type import Permissions +from Products.ERP5Type.Accessor.Constant import PropertyGetter as ConstantGetter from Products.ERP5.Document.PresencePeriod import PresencePeriod class GroupCalendarAssignment(PresencePeriod): @@ -38,6 +39,10 @@ class GroupCalendarAssignment(PresencePeriod): security = ClassSecurityInfo() security.declareObjectProtected(Permissions.AccessContentsInformation) + # XXX GroupCalendarAssignment are not a delivery, but we enable this to be able + # to search them by date in the module. + isDelivery = ConstantGetter('isDelivery', value=True) + security.declareProtected(Permissions.AccessContentsInformation, 'getPeriodList') def getPeriodList(self): diff --git a/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/GroupCalendarAssignmentModule_viewGroupCalendarAssignmentList/listbox.xml b/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/GroupCalendarAssignmentModule_viewGroupCalendarAssignmentList/listbox.xml index 5de711f9f4000271cedf16d435508b2b37a839a5..768ab418a2c73e8438088166aa09f99ffe4fb1ff 100644 --- a/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/GroupCalendarAssignmentModule_viewGroupCalendarAssignmentList/listbox.xml +++ b/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/GroupCalendarAssignmentModule_viewGroupCalendarAssignmentList/listbox.xml @@ -13,7 +13,6 @@ <string>all_columns</string> <string>columns</string> <string>portal_types</string> - <string>sort</string> <string>title</string> </list> </value> @@ -80,16 +79,20 @@ <value> <list> <tuple> - <string>title</string> - <string>Title</string> + <string>specialise_title</string> + <string>Group Calendar Assignment</string> </tuple> <tuple> - <string>description</string> - <string>Description</string> + <string>delivery.start_date</string> + <string>Start Date</string> </tuple> <tuple> - <string>translated_simulation_state_title</string> - <string>State</string> + <string>delivery.stop_date</string> + <string>Stop Date</string> + </tuple> + <tuple> + <string>owner_title</string> + <string>Owner</string> </tuple> <tuple> <string>creation_date</string> @@ -116,6 +119,10 @@ <string>title</string> <string>Title</string> </tuple> + <tuple> + <string>destination_title</string> + <string>Destination</string> + </tuple> <tuple> <string>description</string> <string>Description</string> @@ -146,17 +153,6 @@ </list> </value> </item> - <item> - <key> <string>sort</string> </key> - <value> - <list> - <tuple> - <string>title</string> - <string>title</string> - </tuple> - </list> - </value> - </item> <item> <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> diff --git a/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/GroupCalendarModule_viewGroupCalendarList/listbox.xml b/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/GroupCalendarModule_viewGroupCalendarList/listbox.xml index 75cc02074c7e1f3a51de6436ba26a86c85c5f1aa..f6083ae4d2f70fc07a82f2c9387a71a194d76b83 100644 --- a/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/GroupCalendarModule_viewGroupCalendarList/listbox.xml +++ b/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/GroupCalendarModule_viewGroupCalendarList/listbox.xml @@ -10,14 +10,11 @@ <key> <string>delegated_list</string> </key> <value> <list> - <string>title</string> - <string>columns</string> <string>all_columns</string> - <string>search_columns</string> - <string>sort_columns</string> - <string>sort</string> - <string>selection_name</string> + <string>columns</string> <string>portal_types</string> + <string>selection_name</string> + <string>title</string> </list> </value> </item> @@ -83,16 +80,8 @@ <value> <list> <tuple> - <string>title</string> - <string>Title</string> - </tuple> - <tuple> - <string>description</string> - <string>Description</string> - </tuple> - <tuple> - <string>translated_simulation_state_title</string> - <string>State</string> + <string>owner_title</string> + <string>Owner</string> </tuple> <tuple> <string>creation_date</string> @@ -149,75 +138,10 @@ </list> </value> </item> - <item> - <key> <string>search_columns</string> </key> - <value> - <list> - <tuple> - <string>title</string> - <string>Title</string> - </tuple> - <tuple> - <string>description</string> - <string>Description</string> - </tuple> - <tuple> - <string>translated_simulation_state_title</string> - <string>State</string> - </tuple> - <tuple> - <string>creation_date</string> - <string>Creation Date</string> - </tuple> - <tuple> - <string>modification_date</string> - <string>Modification Date</string> - </tuple> - </list> - </value> - </item> <item> <key> <string>selection_name</string> </key> <value> <string>group_calendar_selection</string> </value> </item> - <item> - <key> <string>sort</string> </key> - <value> - <list> - <tuple> - <string>title</string> - <string>title</string> - </tuple> - </list> - </value> - </item> - <item> - <key> <string>sort_columns</string> </key> - <value> - <list> - <tuple> - <string>title</string> - <string>Title</string> - </tuple> - <tuple> - <string>description</string> - <string>Description</string> - </tuple> - <tuple> - <string>translated_simulation_state_title</string> - <string>State</string> - </tuple> - <tuple> - <string>creation_date</string> - <string>Creation Date</string> - </tuple> - <tuple> - <string>modification_date</string> - <string>Modification Date</string> - </tuple> - </list> - </value> - </item> <item> <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> diff --git a/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/LeaveRequestModule_viewLeaveRequestList/listbox.xml b/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/LeaveRequestModule_viewLeaveRequestList/listbox.xml index 3a980175a095926273b3e973687deb843fa38c6c..f68222d661b74ea3be262f4f527ed07f3f90af79 100644 --- a/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/LeaveRequestModule_viewLeaveRequestList/listbox.xml +++ b/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/LeaveRequestModule_viewLeaveRequestList/listbox.xml @@ -10,14 +10,11 @@ <key> <string>delegated_list</string> </key> <value> <list> - <string>title</string> - <string>columns</string> <string>all_columns</string> - <string>search_columns</string> - <string>sort_columns</string> - <string>sort</string> - <string>selection_name</string> + <string>columns</string> <string>portal_types</string> + <string>selection_name</string> + <string>title</string> </list> </value> </item> @@ -83,24 +80,8 @@ <value> <list> <tuple> - <string>title</string> - <string>Title</string> - </tuple> - <tuple> - <string>destination_title</string> - <string>Person</string> - </tuple> - <tuple> - <string>Calendar_getDestinationSubordinationTitle</string> - <string>Organisation</string> - </tuple> - <tuple> - <string>description</string> - <string>Description</string> - </tuple> - <tuple> - <string>translated_simulation_state_title</string> - <string>State</string> + <string>owner_title</string> + <string>Owner</string> </tuple> <tuple> <string>creation_date</string> @@ -165,83 +146,10 @@ </list> </value> </item> - <item> - <key> <string>search_columns</string> </key> - <value> - <list> - <tuple> - <string>title</string> - <string>Title</string> - </tuple> - <tuple> - <string>destination_title</string> - <string>Person</string> - </tuple> - <tuple> - <string>description</string> - <string>Description</string> - </tuple> - <tuple> - <string>translated_simulation_state_title</string> - <string>State</string> - </tuple> - <tuple> - <string>creation_date</string> - <string>Creation Date</string> - </tuple> - <tuple> - <string>modification_date</string> - <string>Modification Date</string> - </tuple> - </list> - </value> - </item> <item> <key> <string>selection_name</string> </key> <value> <string>leave_request_selection</string> </value> </item> - <item> - <key> <string>sort</string> </key> - <value> - <list> - <tuple> - <string>title</string> - <string>title</string> - </tuple> - </list> - </value> - </item> - <item> - <key> <string>sort_columns</string> </key> - <value> - <list> - <tuple> - <string>title</string> - <string>Title</string> - </tuple> - <tuple> - <string>destination_title</string> - <string>Person</string> - </tuple> - <tuple> - <string>description</string> - <string>Description</string> - </tuple> - <tuple> - <string>translated_simulation_state_title</string> - <string>State</string> - </tuple> - <tuple> - <string>creation_date</string> - <string>Creation Date</string> - </tuple> - <tuple> - <string>modification_date</string> - <string>Modification Date</string> - </tuple> - </list> - </value> - </item> <item> <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value> diff --git a/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PresenceRequestModule_viewPresenceRequestList/listbox.xml b/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PresenceRequestModule_viewPresenceRequestList/listbox.xml index 984c5c511eb9020477604c363fa2ef70f3cc5dae..eb17e5a63a6c6bad28e2c2ae140da3c2b353bf5c 100644 --- a/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PresenceRequestModule_viewPresenceRequestList/listbox.xml +++ b/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PresenceRequestModule_viewPresenceRequestList/listbox.xml @@ -10,14 +10,11 @@ <key> <string>delegated_list</string> </key> <value> <list> - <string>title</string> - <string>columns</string> <string>all_columns</string> - <string>search_columns</string> - <string>sort_columns</string> - <string>sort</string> - <string>selection_name</string> + <string>columns</string> <string>portal_types</string> + <string>selection_name</string> + <string>title</string> </list> </value> </item> @@ -83,24 +80,8 @@ <value> <list> <tuple> - <string>title</string> - <string>Title</string> - </tuple> - <tuple> - <string>destination_title</string> - <string>Person</string> - </tuple> - <tuple> - <string>Calendar_getDestinationSubordinationTitle</string> - <string>Organisation</string> - </tuple> - <tuple> - <string>description</string> - <string>Description</string> - </tuple> - <tuple> - <string>translated_simulation_state_title</string> - <string>State</string> + <string>owner_title</string> + <string>Owner</string> </tuple> <tuple> <string>creation_date</string> @@ -165,83 +146,10 @@ </list> </value> </item> - <item> - <key> <string>search_columns</string> </key> - <value> - <list> - <tuple> - <string>title</string> - <string>Title</string> - </tuple> - <tuple> - <string>destination_title</string> - <string>Person</string> - </tuple> - <tuple> - <string>description</string> - <string>Description</string> - </tuple> - <tuple> - <string>translated_simulation_state_title</string> - <string>State</string> - </tuple> - <tuple> - <string>creation_date</string> - <string>Creation Date</string> - </tuple> - <tuple> - <string>modification_date</string> - <string>Modification Date</string> - </tuple> - </list> - </value> - </item> <item> <key> <string>selection_name</string> </key> <value> <string>presence_request_selection</string> </value> </item> - <item> - <key> <string>sort</string> </key> - <value> - <list> - <tuple> - <string>title</string> - <string>Title</string> - </tuple> - </list> - </value> - </item> - <item> - <key> <string>sort_columns</string> </key> - <value> - <list> - <tuple> - <string>title</string> - <string>Title</string> - </tuple> - <tuple> - <string>destination_title</string> - <string>Person</string> - </tuple> - <tuple> - <string>description</string> - <string>Description</string> - </tuple> - <tuple> - <string>translated_simulation_state_title</string> - <string>State</string> - </tuple> - <tuple> - <string>creation_date</string> - <string>Creation Date</string> - </tuple> - <tuple> - <string>modification_date</string> - <string>Modification Date</string> - </tuple> - </list> - </value> - </item> <item> <key> <string>target</string> </key> <value> <string>Click to edit the target</string> </value>