diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_countDefaultEventPathDestinationList.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_countDefaultEventPathDestinationList.xml index 113ac4a4688fd8e88100e4e944a7d0230f97fd0f..dc39a1916eac89a49033897c111202bfc4202ee0 100644 --- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_countDefaultEventPathDestinationList.xml +++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_countDefaultEventPathDestinationList.xml @@ -51,7 +51,9 @@ <item> <key> <string>_body</string> </key> <value> <string>portal_catalog = context.getPortalObject().portal_catalog\n -return portal_catalog.countResults(selection_domain={\'campagin_domain\': (\'portal_domains\', context.getDefaultEventPathDestination())})\n +domain = context.getDefaultEventPathDestinationValue()\n +return portal_catalog.countResults(\n + selection_domain={domain.getParentId(): (\'portal_domains\', domain.getRelativeUrl(),)})\n </string> </value> </item> <item> diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_createEventFromDefaultEventPath.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_createEventFromDefaultEventPath.xml index 5e9f3120c617dcd0e0e739993c3d0ff10f8790a4..eb85575a330ff686a78517e46398130f570ca0de 100644 --- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_createEventFromDefaultEventPath.xml +++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_createEventFromDefaultEventPath.xml @@ -51,14 +51,13 @@ <item> <key> <string>_body</string> </key> <value> <string>portal = context.getPortalObject()\n -destination = context.getDefaultEventPathDestination()\n -domain = portal.portal_domains.restrictedTraverse(destination)\n +domain = context.getDefaultEventPathDestinationValue()\n event_path = context.getDefaultEventPathValue(portal_type="Event Path")\n \n method_kw = {\'event_path\': event_path.getRelativeUrl(),\n \'keep_draft\': keep_draft}\n portal.portal_catalog.searchAndActivate("Entity_createEventFromDefaultEventPath",\n - selection_domain={domain.getParentId(): (\'portal_domains\', destination)},\n + selection_domain={domain.getParentId(): (\'portal_domains\', domain.getRelativeUrl())},\n method_kw=method_kw)\n \n return context.Base_redirect(\n diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_getDefaultEventPathDestinationList.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_getDefaultEventPathDestinationList.xml index 8dcdf704c6776d33f3e28e56e1faeed8ed53d760..2291236c2511494d90332689da7c47eba75c8cb7 100644 --- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_getDefaultEventPathDestinationList.xml +++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_getDefaultEventPathDestinationList.xml @@ -51,12 +51,11 @@ <item> <key> <string>_body</string> </key> <value> <string>portal = context.getPortalObject()\n -destination = context.getDefaultEventPathDestination()\n -if destination is None:\n +domain = context.getDefaultEventPathDestinationValue()\n +if domain is None:\n return []\n \n -domain = portal.portal_domains.restrictedTraverse(destination)\n -return portal.portal_catalog(selection_domain={domain.getParentId(): (\'portal_domains\', destination)})\n +return portal.portal_catalog(selection_domain={domain.getParentId(): (\'portal_domains\', domain.getRelativeUrl())})\n </string> </value> </item> <item> diff --git a/bt5/erp5_crm/bt/revision b/bt5/erp5_crm/bt/revision index 5156988895747eb2ca7584975c2cb3bfa0816719..c8a110e7e87316b30c8d157f061feb45c9e49cb8 100644 --- a/bt5/erp5_crm/bt/revision +++ b/bt5/erp5_crm/bt/revision @@ -1 +1 @@ -619 \ No newline at end of file +621 \ No newline at end of file