Commit 20c31cf4 authored by Carlos Ramos Carreño's avatar Carlos Ramos Carreño Committed by Jérome Perrin

Review/fix diff and passed all tests locally.

parent 0d1c14f5
import json import json
import base64 import base64
from erp5.component.module.Log import log from erp5.component.module.Log import log
from Products.ERP5Type.Utils import bytes2str, str2bytes
def getElementFromContent(key, content): def getElementFromContent(key, content):
before_template = '"%s" type="text/x-renderjs-configuration">' before_template = '"%s" type="text/x-renderjs-configuration">'
...@@ -69,22 +70,22 @@ try: ...@@ -69,22 +70,22 @@ try:
configuration_path_list = [] configuration_path_list = []
for key in portal_actions_dict: for key in portal_actions_dict:
path = "portal_types/%s" % key path = "portal_types/%s" % key
configuration_path_list.append(base64.b64encode(path.encode()).decode()) configuration_path_list.append(bytes2str(base64.b64encode(str2bytes(path))))
for action in portal_actions_dict[key]: for action in portal_actions_dict[key]:
path = "portal_types/%s/%s" % (key, action) path = "portal_types/%s/%s" % (key, action)
configuration_path_list.append(base64.b64encode(path.encode()).decode()) configuration_path_list.append(bytes2str(base64.b64encode(str2bytes(path))))
try: try:
action_object = context.restrictedTraverse(path) action_object = context.restrictedTraverse(path)
form = action_object.getActionText().split('/')[-1] form = action_object.getActionText().split('/')[-1]
path = "portal_skins/%s/%s" % (portal_skin, form) path = "portal_skins/%s/%s" % (portal_skin, form)
configuration_path_list.append(base64.b64encode(path.encode()).decode()) configuration_path_list.append(bytes2str(base64.b64encode(str2bytes(path))))
except KeyError as e: except KeyError as e:
raise KeyError("Error getting portal action info: " + str(e)) raise KeyError("Error getting portal action info: " + str(e))
if new_dialog_form_list: if new_dialog_form_list:
for form in new_dialog_form_list: for form in new_dialog_form_list:
path = "portal_skins/%s/%s" % (portal_skin, form) path = "portal_skins/%s/%s" % (portal_skin, form)
configuration_path_list.append(base64.b64encode(path.encode()).decode()) configuration_path_list.append(bytes2str(base64.b64encode(str2bytes(path))))
url_list = [] url_list = []
for path in configuration_path_list: for path in configuration_path_list:
......
from Products.ERP5Type.Message import translateString from Products.ERP5Type.Message import translateString
from Products.ERP5Type.Utils import bytes2str
portal = context.getPortalObject() portal = context.getPortalObject()
support_request = context.getFollowUpValue() support_request = context.getFollowUpValue()
web_site_value = portal.restrictedTraverse(web_site_relative_url) web_site_value = portal.restrictedTraverse(web_site_relative_url)
...@@ -34,7 +35,7 @@ web_message = portal.event_module.newContent( ...@@ -34,7 +35,7 @@ web_message = portal.event_module.newContent(
portal_type='Web Message', portal_type='Web Message',
title=context.getTitle() if context.hasTitle() else None, title=context.getTitle() if context.hasTitle() else None,
content_type='text/html' if is_html else 'text/plain', content_type='text/html' if is_html else 'text/plain',
text_content=data.decode('utf-8'), text_content=bytes2str(data),
follow_up_value=support_request, follow_up_value=support_request,
aggregate_value_list=[context] + context.getSuccessorValueList( aggregate_value_list=[context] + context.getSuccessorValueList(
portal_type=portal.getPortalDocumentTypeList()), portal_type=portal.getPortalDocumentTypeList()),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment