From e70fee7777825fab3717362641be77e2b8f5aec2 Mon Sep 17 00:00:00 2001 From: Salvatore La Manna Date: Fri, 27 Nov 2020 14:13:15 +0100 Subject: [PATCH] Niente --- .../docroot/WEB-INF/src/service.properties | 4 ++-- .../docroot/WEB-INF/src/service.properties | 4 ++-- .../workflow_tasks/render_form_task.jsp | 21 ++++++++++++------- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties index 54a8579a..a495700a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_bo - build.number=2742 - build.date=1606385864618 + build.number=2753 + build.date=1606474724182 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties index 3cf413e7..47458fb6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_Mail - build.number=78 - build.date=1604403348058 + build.number=79 + build.date=1606474474656 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/render_form_task.jsp b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/render_form_task.jsp index b0fad86b..b10e849d 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/render_form_task.jsp +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_tasks/render_form_task.jsp @@ -138,8 +138,18 @@ if (ddmTemplateId > 0) { requestedLocale="<%= LocaleUtil.fromLanguageId(languageId) %>" /> -<% salva("prima.txt", html); %> -<%= normalize(html, parameters, fieldNameOptions, renderResponse, prefix, suffix) %> +<% salva("inizio.html", html); %> +<%= + normalize(html, parameters, fieldNameOptions, renderResponse, prefix, suffix) + Log _log = LogFactoryUtil.getLog("render_form_task_jsp_salva"); + for (Map.Entry>> entry : fieldNameOptions.entrySet()) { + + } +/* html.replaceAll( + "\\sname=\"" + renderResponse.getNamespace() + "(.*?)_INSTANCE_[^\"]*", + " name=\"" + prefix + "$1" + suffix + )*/ +%> <%! private String normalize(String html, Map parameters, @@ -149,9 +159,9 @@ private String normalize(String html, Map parameters, if (Validator.isNull(html)) { return StringPool.BLANK; } + // replace portlet namespace + random namespace html = html.replaceAll("name=\"" + renderResponse.getNamespace(), "name=\""); - try { Parser parser = Parser.createParser(html, StringPool.UTF8); @@ -162,16 +172,13 @@ private String normalize(String html, Map parameters, } html = nodeList.toHtml(); - } catch (ParserException e) { } // add prefix + suffix html = html.replaceAll("name=\"(.*?)\"", "name=\"" + prefix + "$1" + suffix + "\""); - // ignore ddm fields display - html = html.replaceAll("name=\"" + prefix + "_fieldsDisplay" + suffix, "name=\"_fieldsDisplay\""); - salva("dopo.txt", html); + html = html.replaceAll("name=\"" + prefix + "_fieldsDisplay" + suffix + "\"", "name=\"_fieldsDisplay\""); return html; }