[ofbiz-framework] branch trunk updated: Improved: Headerize external script in multi-block html template (OFBIZ-11741)

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 4b55e07  Improved: Headerize external script in multi-block html 
template (OFBIZ-11741)
4b55e07 is described below

commit 4b55e07505c8e3ecc9a88bfef5866a5eb5381f62
Author: Jacques Le Roux 
AuthorDate: Mon Jun 1 07:52:59 2020 +0200

Improved: Headerize external script in multi-block html template 
(OFBIZ-11741)

Fixes Javadoc issues
---
 .../java/org/apache/ofbiz/widget/model/MultiBlockHtmlTemplateUtil.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MultiBlockHtmlTemplateUtil.java
 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MultiBlockHtmlTemplateUtil.java
index 0262a70..e850c47 100644
--- 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MultiBlockHtmlTemplateUtil.java
+++ 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MultiBlockHtmlTemplateUtil.java
@@ -111,7 +111,6 @@ public final class MultiBlockHtmlTemplateUtil {
  * @param location screen location. Expression is not allowed.
  * @param name screen name. Expression is not allowed.
  * @param urls Set of html links associated with the screen. May contain 
expression to html-template location.
- * @throws Exception
  */
 public static void addLinksToHtmlImportCache(String location, String name, 
Set urls) {
 if (UtilValidate.isEmpty(urls)) {
@@ -167,7 +166,7 @@ public final class MultiBlockHtmlTemplateUtil {
 /**
  * Add html links to the header
  * @param context
- * @throws Exception
+ * @throws IOException
  */
 public static void addLinksToLayoutSettings(final Map 
context) throws IOException {
 HttpServletRequest request = (HttpServletRequest) 
context.get("request");

[ofbiz-framework] branch trunk updated: Improved: Headerize external script in multi-block html template (OFBIZ-11741)

2020-05-31 Thread jamesyong 
This is an automated email from the ASF dual-hosted git repository.

jamesyong pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
 new a5ab396  Improved: Headerize external script in multi-block html 
template (OFBIZ-11741)
a5ab396 is described below

commit a5ab3961faeda725bdd377e26f5383141958787a
Author: James Yong 
AuthorDate: Sun May 31 23:31:49 2020 +0800

Improved: Headerize external script in multi-block html template 
(OFBIZ-11741)

Allow expression in template location.
---
 .../org/apache/ofbiz/widget/model/HtmlWidget.java  | 16 ++--
 .../ofbiz/widget/model/ModelScreenWidget.java  | 12 +---
 .../widget/model/MultiBlockHtmlTemplateUtil.java   | 22 +-
 3 files changed, 24 insertions(+), 26 deletions(-)

diff --git 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java
index 3e4f3cd..b7a9cc9 100644
--- 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java
+++ 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java
@@ -197,11 +197,6 @@ public class HtmlWidget extends ModelScreenWidget {
 Elements scriptElements = doc.select("script");
 if (scriptElements != null && scriptElements.size() > 0) {
 StringBuilder scripts = new StringBuilder();
-
-// check if location contains variable
-String originalLocation = locationExdr.getOriginal();
-boolean isStaticLocation = !originalLocation.contains("${");
-
 for (org.jsoup.nodes.Element script : scriptElements) {
 String type = script.attr("type");
 String src = script.attr("src");
@@ -213,15 +208,8 @@ public class HtmlWidget extends ModelScreenWidget {
 } else {
 String dataImport = script.attr("data-import");
 if ("head".equals(dataImport)) {
-if (isStaticLocation) {
-// remove external script in the template that is 
meant to be imported in the html header
-script.remove();
-} else {
-// throw error to the browser
-writer.append("alert('Unable to headerize "
-+ 
UtilCodec.getEncoder("html").encode(script.toString())
-+ " when template location not is 
static');");
-}
+// remove external script in the template that is 
meant to be imported in the html header
+script.remove();
 }
 }
 }
diff --git 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java
 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java
index c3701f3..c34dfc5 100644
--- 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java
+++ 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelScreenWidget.java
@@ -270,13 +270,9 @@ public abstract class ModelScreenWidget extends 
ModelWidget {
 public void renderWidgetString(Appendable writer, Map 
context,
ScreenStringRenderer 
screenStringRenderer) throws GeneralException, IOException {
 
-try {
-String location = getModelScreen().getSourceLocation();
-String name = getModelScreen().getName();
-MultiBlockHtmlTemplateUtil.addLinksToLayoutSettings(context, 
location, name);
-} catch (Exception e) {
-throw new GeneralException(e);
-}
+String location = getModelScreen().getSourceLocation();
+String name = getModelScreen().getName();
+MultiBlockHtmlTemplateUtil.storeScreenLocationName(context, 
location, name);
 
 // check the condition, if there is one
 boolean condTrue = true;
@@ -292,6 +288,8 @@ public abstract class ModelScreenWidget extends ModelWidget 
{
 AbstractModelAction.runSubActions(this.actions, context);
 
 try {
+
MultiBlockHtmlTemplateUtil.addLinksToLayoutSettings(context);
+
 // section by definition do not themselves do anything, so 
this method will generally do nothing, but we'll call it anyway
 screenStringRenderer.renderSectionBegin(writer, context, 
this);
 
diff --git 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MultiBlockHtmlTemplateUtil.java
 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/MultiBlockHtmlTemplateUtil.java
index a7bc33e..0262a70 100644
---

[ofbiz-framework] 02/02: Improved: Rainbow theme: use the United Nations flag ad default flag (OFBIZ-11705)

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 51d91619ea582920e003849c5542f0d52b5c2b44
Author: Jacques Le Roux 
AuthorDate: Sun May 31 12:39:20 2020 +0200

Improved: Rainbow theme: use the United Nations flag ad default flag 
(OFBIZ-11705)

Oops, I missed to add the un flag files
---
 .../webapp/rainbowstone/flags/1x1/un.svg   | 68 ++
 .../webapp/rainbowstone/flags/4x3/un.svg   | 68 ++
 2 files changed, 136 insertions(+)

diff --git a/themes/rainbowstone/webapp/rainbowstone/flags/1x1/un.svg 
b/themes/rainbowstone/webapp/rainbowstone/flags/1x1/un.svg
new file mode 100644
index 000..d5b503f
--- /dev/null
+++ b/themes/rainbowstone/webapp/rainbowstone/flags/1x1/un.svg
@@ -0,0 +1,68 @@
+http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; height="800" width="1200">@media screen {
+
+/* Leading rule */
+html {
+  -webkit-filter: invert(100%) hue-rotate(180deg) !important;
+  filter: invert(100%) hue-rotate(180deg) !important;
+}
+
+/* Reverse rule */
+img,
+video,
+:not(object):not(body)>embed,
+object,
+svg image,
+[style*="background:url"],
+[style*="background-image:url"],
+[style*="background: url"],
+[style*="background-image: url"],
+[background],
+twitterwidget {
+  -webkit-filter: invert(100%) hue-rotate(180deg) !important;
+  filter: invert(100%) hue-rotate(180deg) !important;
+}
+[style*="background:url"] *,
+[style*="background-image:url"] *,
+[style*="background: url"] *,
+[style*="background-image: url"] *,
+input,
+[background] *,
+img[src^="https://s0.wp.com/latex.php";],
+twitterwidget .NaturalImage-image {
+  -webkit-filter: none !important;
+  filter: none !important;
+}
+.compatibility-with-darkreader-below-4-3-3 {
+  background: white !important;
+}
+
+/* Text contrast */
+html {
+  text-shadow: 0 0 0 !important;
+}
+
+/* Full screen */
+:-webkit-full-screen, :-webkit-full-screen * {
+  -webkit-filter: none !important;
+  filter: none !important;
+}
+:-moz-full-screen, :-moz-full-screen * {
+  -webkit-filter: none !important;
+  filter: none !important;
+}
+:fullscreen, :fullscreen * {
+  -webkit-filter: none !important;
+  filter: none !important;
+}
+
+/* Page background */
+html {
+  background: rgb(0,0,0) !important;
+}
+
+/* Custom rules */
+.compatibility-with-darkreader-below-4-3-3 {
+background: white !important;
+}
+
+}http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; height="800" width="1200">@media screen {
+
+/* Leading rule */
+html {
+  -webkit-filter: invert(100%) hue-rotate(180deg) !important;
+  filter: invert(100%) hue-rotate(180deg) !important;
+}
+
+/* Reverse rule */
+img,
+video,
+:not(object):not(body)>embed,
+object,
+svg image,
+[style*="background:url"],
+[style*="background-image:url"],
+[style*="background: url"],
+[style*="background-image: url"],
+[background],
+twitterwidget {
+  -webkit-filter: invert(100%) hue-rotate(180deg) !important;
+  filter: invert(100%) hue-rotate(180deg) !important;
+}
+[style*="background:url"] *,
+[style*="background-image:url"] *,
+[style*="background: url"] *,
+[style*="background-image: url"] *,
+input,
+[background] *,
+img[src^="https://s0.wp.com/latex.php";],
+twitterwidget .NaturalImage-image {
+  -webkit-filter: none !important;
+  filter: none !important;
+}
+.compatibility-with-darkreader-below-4-3-3 {
+  background: white !important;
+}
+
+/* Text contrast */
+html {
+  text-shadow: 0 0 0 !important;
+}
+
+/* Full screen */
+:-webkit-full-screen, :-webkit-full-screen * {
+  -webkit-filter: none !important;
+  filter: none !important;
+}
+:-moz-full-screen, :-moz-full-screen * {
+  -webkit-filter: none !important;
+  filter: none !important;
+}
+:fullscreen, :fullscreen * {
+  -webkit-filter: none !important;
+  filter: none !important;
+}
+
+/* Page background */
+html {
+  background: rgb(0,0,0) !important;
+}
+
+/* Custom rules */
+.compatibility-with-darkreader-below-4-3-3 {
+background: white !important;
+}
+

[ofbiz-framework] 01/02: Improved: Rainbow theme: use the United Nations flag ad default flag (OFBIZ-11705)

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 6c6f1e1135cba6a35ac4c5eb37bcc3db743c3817
Author: Jacques Le Roux 
AuthorDate: Sun May 31 12:36:44 2020 +0200

Improved: Rainbow theme: use the United Nations flag ad default flag 
(OFBIZ-11705)

This follows OFBIZ-9866: where I proposed to use the United Nations flag
as default flag

Pierre noticed that no flag shows when a meta language (like en) is chosen.

I noticed that some meta language have default values (gb, fr, zh, th). So 
I did
not apply Pierre's GH PR#154 to keep those, because that can be increased.

I added the un.svg flag from https://en.wikipedia.org/wiki/United_Nations
I did not adapt its size. Since it's SVG it should be OK in most cases
I also added the necessary change at the end of in flag-icon.min.css

Thanks: Pierre Smits for the initial patch
---
 themes/rainbowstone/template/includes/Avatar.ftl  | 10 ++
 themes/rainbowstone/webapp/rainbowstone/flag-icon.min.css |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/themes/rainbowstone/template/includes/Avatar.ftl 
b/themes/rainbowstone/template/includes/Avatar.ftl
index b32a43d..0100f36 100644
--- a/themes/rainbowstone/template/includes/Avatar.ftl
+++ b/themes/rainbowstone/template/includes/Avatar.ftl
@@ -41,10 +41,12 @@ under the License.
 
 <#assign userLang = locale.toString()>
 <#assign flagLang = locale.toString()?keep_after_last("_")>
-<#if "en" == userLang><#assign flagLang = "GB">
-<#if "fr" == userLang><#assign flagLang = "FR">
-<#if "zh" == userLang><#assign flagLang = "SG">
-<#if "th" == userLang><#assign flagLang = "TH">
+<#if "en" == userLang || "fr" == userLang || "zh" == userLang || 
"th" == userLang>
+<#if "en" == userLang><#assign flagLang = "GB">
+<#if "fr" == userLang><#assign flagLang = "FR">
+<#if "zh" == userLang><#assign flagLang = "SG">
+<#if "th" == userLang><#assign flagLang = "TH">
+<#elseif 2 == userLang?length><#assign flagLang = "UN">
 <#if userLang?size <= 
2>${userLang}<#else>${flagLang}
 
 
diff --git a/themes/rainbowstone/webapp/rainbowstone/flag-icon.min.css 
b/themes/rainbowstone/webapp/rainbowstone/flag-icon.min.css
index dd768f4..5a8d636 100644
--- a/themes/rainbowstone/webapp/rainbowstone/flag-icon.min.css
+++ b/themes/rainbowstone/webapp/rainbowstone/flag-icon.min.css
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-.flag-icon,.flag-icon-background{background-repeat:no-repeat;background-size:contain;background-position:50%}.flag-icon{position:relative;display:inline-block;width:1.em;line-height:1em}.flag-icon:before{content:"\00a0"}.flag-icon.flag-icon-squared{width:1em}.flag-icon-ad{background-image:url(/rainbowstone/flags//4x3/ad.svg)}.flag-icon-ad.flag-icon-squared{background-image:url(/rainbowstone/flags//1x1/ad.svg)}.flag-icon-ae{background-image:url(/rainbowstone/flags//4x3/ae.svg)}.fl
 [...]
\ No newline at end of file
+.flag-icon,.flag-icon-background{background-repeat:no-repeat;background-size:contain;background-position:50%}.flag-icon{position:relative;display:inline-block;width:1.em;line-height:1em}.flag-icon:before{content:"\00a0"}.flag-icon.flag-icon-squared{width:1em}.flag-icon-ad{background-image:url(/rainbowstone/flags//4x3/ad.svg)}.flag-icon-ad.flag-icon-squared{background-image:url(/rainbowstone/flags//1x1/ad.svg)}.flag-icon-ae{background-image:url(/rainbowstone/flags//4x3/ae.svg)}.fl
 [...]
\ No newline at end of file

[ofbiz-framework] branch trunk updated (f85040f -> 51d9161)

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git.


from f85040f  Improved: Headerize external script in multi-block html 
template (OFBIZ-11741)
 new 6c6f1e1  Improved: Rainbow theme: use the United Nations flag ad 
default flag (OFBIZ-11705)
 new 51d9161  Improved: Rainbow theme: use the United Nations flag ad 
default flag (OFBIZ-11705)

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 themes/rainbowstone/template/includes/Avatar.ftl   | 10 ++--
 .../webapp/rainbowstone/flag-icon.min.css  |  2 +-
 .../webapp/rainbowstone/flags/1x1/un.svg   | 68 ++
 .../webapp/rainbowstone/flags/4x3/un.svg   | 68 ++
 4 files changed, 143 insertions(+), 5 deletions(-)
 create mode 100644 themes/rainbowstone/webapp/rainbowstone/flags/1x1/un.svg
 create mode 100644 themes/rainbowstone/webapp/rainbowstone/flags/4x3/un.svg

buildbot exception in on ofbizTrunkFrameworkPlugins

2020-05-31 Thread buildbot 
The Buildbot has detected a build exception on builder 
ofbizTrunkFrameworkPlugins while building ofbiz-framework. Full details are 
available at:
https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1436

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf947_ubuntu

Build Reason: downstream
Build Source Stamp: [branch trunk] f85040ff04a70ea17facfd312c329101c3fe817b
Blamelist: James Yong 

BUILD FAILED: exception javadoc upload test-results part 1

Sincerely,
 -The Buildbot

buildbot success in on ofbizBranch17FrameworkPlugins

2020-05-31 Thread buildbot 
The Buildbot has detected a restored build on builder 
ofbizBranch17FrameworkPlugins while building . Full details are available at:
https://ci.apache.org/builders/ofbizBranch17FrameworkPlugins/builds/524

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: forced: by IRC user  (privmsg): forces manual build 
after supposed BuildBot error
Build Source Stamp: HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

[ofbiz-framework] branch trunk updated: Improved: Headerize external script in multi-block html template (OFBIZ-11741)

2020-05-31 Thread jamesyong 
This is an automated email from the ASF dual-hosted git repository.

jamesyong pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
 new f85040f  Improved: Headerize external script in multi-block html 
template (OFBIZ-11741)
f85040f is described below

commit f85040ff04a70ea17facfd312c329101c3fe817b
Author: James Yong 
AuthorDate: Sun May 31 17:42:42 2020 +0800

Improved: Headerize external script in multi-block html template 
(OFBIZ-11741)

Allow expression in template location.
---
 build.gradle   |   2 +-
 framework/widget/dtd/widget-screen.xsd |   2 +-
 .../widget/model/HtmlImportWidgetVisitor.java  | 236 -
 .../org/apache/ofbiz/widget/model/HtmlWidget.java  |  19 ++
 .../ofbiz/widget/model/ModelScreenWidget.java  |  19 --
 .../widget/model/MultiBlockHtmlTemplateUtil.java   | 132 +---
 6 files changed, 128 insertions(+), 282 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7ad21a2..1e55676 100644
--- a/build.gradle
+++ b/build.gradle
@@ -286,7 +286,7 @@ checkstyle {
 // the sum of errors found last time it was changed after using the
 // ‘checkstyle’ tool present in the framework and in the official
 // plugins.
-tasks.checkstyleMain.maxErrors = 26985
+tasks.checkstyleMain.maxErrors = 26908
 // Currently there are a lot of errors so we need to temporarily
 // hide them to avoid polluting the terminal output.
 showViolations = false
diff --git a/framework/widget/dtd/widget-screen.xsd 
b/framework/widget/dtd/widget-screen.xsd
index 6e3fe97..3bf4f1b 100644
--- a/framework/widget/dtd/widget-screen.xsd
+++ b/framework/widget/dtd/widget-screen.xsd
@@ -524,7 +524,7 @@ under the License.
 
 Multi-block processing of template targeted for the html 
body.
 Inline script will be rendered as external script after 
html body tag.
-External script tag with attribute data-import='head' will 
be rendered within html head tag if the template location is static.
+External script tag with attribute data-import='head' will 
be rendered within html head tag.
 
 
 
diff --git 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlImportWidgetVisitor.java
 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlImportWidgetVisitor.java
deleted file mode 100644
index 9e6add0..000
--- 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlImportWidgetVisitor.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/***
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- 
***/
-package org.apache.ofbiz.widget.model;
-
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.ofbiz.base.util.FileUtil;
-import org.apache.ofbiz.base.util.UtilValidate;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.select.Elements;
-
-public final class HtmlImportWidgetVisitor implements ModelWidgetVisitor {
-
-private Set jsImports = new LinkedHashSet();
-
-/**
- * Get the script source locations collected by HtmlImportWidgetVisitor
- * @return
- */
-public Set getJsImports() {
-return jsImports;
-}
-
-@Override
-public void visit(HtmlWidget htmlWidget) throws Exception {
-List widgetList = htmlWidget.getSubWidgets();
-for (ModelScreenWidget widget: widgetList) {
-// HtmlTemplate
-widget.accept(this);
-}
-}
-
-@Override
-public void visit(HtmlWidget.HtmlTemplate htmlTemplate) throws Exception {
-String fileLocation = htmlTemplate.locationExdr.getOriginal();
-boolean isStaticLocation = !fileLocation.contains("${");
-if (isStaticLocation && htmlTemplate.isMultiBlock()) {
-String template =

buildbot success in on ofbizBranch18Framework

2020-05-31 Thread buildbot 
The Buildbot has detected a restored build on builder ofbizBranch18Framework 
while building . Full details are available at:
https://ci.apache.org/builders/ofbizBranch18Framework/builds/335

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: forced: by IRC user  (privmsg): forces manual build 
after supposed BuildBot error
Build Source Stamp: HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

buildbot failure in on ofbizBranch17FrameworkPlugins

2020-05-31 Thread buildbot 
The Buildbot has detected a new failure on builder 
ofbizBranch17FrameworkPlugins while building ofbiz-plugins. Full details are 
available at:
https://ci.apache.org/builders/ofbizBranch17FrameworkPlugins/builds/523

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf947_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'onBranch17PluginsCommit' 
triggered this build
Build Source Stamp: [branch release17.12] 
76775e4a7cb1bf9baa06c5c7ccf24c2ed61fda8a
Blamelist: Jacques Le Roux 

BUILD FAILED: failed shell_6

Sincerely,
 -The Buildbot

[ofbiz-plugins] branch release17.12 updated: Improved: adds pull_request_template.md (OFBIZ-11722)

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch release17.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git


The following commit(s) were added to refs/heads/release17.12 by this push:
 new 76775e4  Improved: adds pull_request_template.md (OFBIZ-11722)
76775e4 is described below

commit 76775e4a7cb1bf9baa06c5c7ccf24c2ed61fda8a
Author: Jacques Le Roux 
AuthorDate: Sun May 31 09:18:47 2020 +0200

Improved: adds pull_request_template.md (OFBIZ-11722)
---
 .github/pull_request_template.md | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 000..d106097
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,11 @@
+Improved:
+Implemented:
+Documented:
+Completed:
+Reverted:
+Fixed:
+(OFBIZ-)
+
+Explanation
+
+Thanks:

[ofbiz-plugins] branch release18.12 updated: Improved: adds pull_request_template.md (OFBIZ-11722)

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git


The following commit(s) were added to refs/heads/release18.12 by this push:
 new 09c9bab  Improved: adds pull_request_template.md (OFBIZ-11722)
09c9bab is described below

commit 09c9bab4d096c3730cdbf1ac8753e28cefbfda1d
Author: Jacques Le Roux 
AuthorDate: Sun May 31 09:18:47 2020 +0200

Improved: adds pull_request_template.md (OFBIZ-11722)
---
 .github/pull_request_template.md | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 000..d106097
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,11 @@
+Improved:
+Implemented:
+Documented:
+Completed:
+Reverted:
+Fixed:
+(OFBIZ-)
+
+Explanation
+
+Thanks:

buildbot failure in on ofbizBranch18Framework

2020-05-31 Thread buildbot 
The Buildbot has detected a new failure on builder ofbizBranch18Framework while 
building ofbiz-framework. Full details are available at:
https://ci.apache.org/builders/ofbizBranch18Framework/builds/334

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 
'onBranch18FrameworkCommit' triggered this build
Build Source Stamp: [branch release18.12] 
9e2c7a10a414b8bb102018635169efbc0eab6c18
Blamelist: Jacques Le Roux 

BUILD FAILED: failed shell_2

Sincerely,
 -The Buildbot

[ofbiz-plugins] branch trunk updated: Improved: adds pull_request_template.md (OFBIZ-11722)

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git


The following commit(s) were added to refs/heads/trunk by this push:
 new a133199  Improved: adds pull_request_template.md (OFBIZ-11722)
a133199 is described below

commit a13319983076815763a6eb2f5e9f55bd86ca3fc3
Author: Jacques Le Roux 
AuthorDate: Sun May 31 09:18:47 2020 +0200

Improved: adds pull_request_template.md (OFBIZ-11722)
---
 .github/pull_request_template.md | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 000..d106097
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,11 @@
+Improved:
+Implemented:
+Documented:
+Completed:
+Reverted:
+Fixed:
+(OFBIZ-)
+
+Explanation
+
+Thanks:

[ofbiz-framework] branch ecomify-OFBIZ-11468_Convert_ShipmentReceiptServices-squashed deleted (was 2ff8190)

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a change to branch 
ecomify-OFBIZ-11468_Convert_ShipmentReceiptServices-squashed
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git.


 was 2ff8190  Improved: removes useless "@deprecated No replacement" 
comments in Java code

This change permanently discards the following revisions:

 discard 2ff8190  Improved: removes useless "@deprecated No replacement" 
comments in Java code
 discard 9c54082  Improved: instructions to upgrade due to datamodel changes 
(OFBIZ-11719) (#162)
 discard db463e7  Documented: datamodel markdown migration to asciidoc 
(OFBIZ-11574)
 discard 4f07148  Fixed: organisation tree in humanres doesn't show person 
names (OFBIZ-11677) (#121)
 discard 7603d5c  Improved: Improved: Changed lineSplit value to 150. 
(OFBIZ-11737) Earlier it was 120, as per discussion over ML we decided to make 
it 150 instead.
 discard ae3f166  Improved: quote menu
 discard 260ae0f  Improved: downgrades tasks.checkstyleMain.maxErrors to stop 
failures in Buildbot
 discard 0caf66d  Improved: Converted 
createDownloadContent,updateDownloadContent services from mini-lang to groovy. 
(OFBIZ-11372)(OFBIZ-11373) Thanks Devanshu Vyas for reporting, Harman Kaur and 
Rahul for initial patch, Pawan for review.
 discard 8a290d3  Improved: Added UI labels for success/error messages for 
humanres, marketing, order component. (OFBIZ-7696) Thanks Deepak Nigam for 
reporting and Sourabh Punyani for the patch.
 discard c759ccd  Fixed: RuntimeException in getPartyNameForDate service for 
partyNameHistory.gender field(OFBIZ-11736)
 discard 335b346  Fixed: Requesthandler exception is showing after clicking 
cancel/done button on editPerson screen (OFBIZ-10890) Set the value of missing 
parameter. Thanks Minal Phalak for reporting and providing the patch
 discard 835de70  Improved: Converted updatePayment service from mini-lang to 
groovy. (OFBIZ-11480) Thanks Devanshu Vyas for reporting and Priya Sharma for 
the patch.
 discard 36b4837  Improved: All the service level error messages for missing 
required field for humanares component. (OFBIZ-8716) Thanks Jagpreet for 
reporting and Prasheel for providing the initial patch
 discard 71b4abe  Fixed: paginateOrderList does not find orders on next page 
specific to FindOrders.ftl (OFBIZ-11356) Adding the missing showAll flag in the 
paginateOrder form because of which the orders were not shown while submitting 
the next button. Thanks Michael Brohl for reporting the issue and Ankit Joshi 
for providing the patch
 discard 452a893  Improved: Make shipment services loosely coupled with 
work-effort generation. (#132)
 discard d5c7151  Improved: Converted createPaymentAndApplicationForParty 
service from mini-lang to groovy (OFBIZ-11491) Thanks Devanshu Vyas for 
reporting and Sourabh Punyani for providing the patch.
 discard d0fb482  Improved: Converted massChangePaymentStatus service from 
mini-lang to groovy. (OFBIZ-11498) Thanks Devanshu Vyas for reporting and 
Rushikesh Mawal for initial patch.
 discard ae2585c  Improved: Convert setContentStatus service from mini-lang to 
groovy DSL(OFBIZ-11365). Thanks Devanshu Vyas for the contribution.
 discard 3e4a2ec  Improved: Converted createPaymentContent, 
updatePaymentContent services from mini-lang to groovy. (#155)
 discard 05640f7  Improved: Apply multi-block attr to each application 
(OFBIZ-11706)
 discard a45f0f2  Improved: Refactor simple methods names as per naming 
convention best practices. (#137)
 discard fa1c0eb  Improved: Converted getPaymentRunningTotal service from 
mini-lang to groovy DSL (OFBIZ-11488) Thanks Nitish Mishra for the patch and 
Devanshu Vyas for reporting and review.
 discard ffede15  Improved: just remove trailing space
 discard c020b56  Improved: Apply multi-block attr to each application 
(OFBIZ-11706)
 discard 2621fd4  Fixed: showjGrowl called twice (OFBIZ-11720)
 discard 1f44bcd  Improved: Apply multi-block attr to each application 
(OFBIZ-11706)
 discard 39d0b91  Improved: Clean how HTTP vs HTTPS is handled
 discard 3f6e976  Fixed: Entering manually date in date-time field become 
unworkable (OFBIZ-10432)

[ofbiz-framework] 09/28: Improved: Apply multi-block attr to each application (OFBIZ-11706)

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch 
ecomify-OFBIZ-11468_Convert_ShipmentReceiptServices-squashed
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 05640f79f544b96be7f1ef73dd4c1d1e9ff39b9d
Author: James Yong 
AuthorDate: Sat May 23 14:08:35 2020 +0800

Improved: Apply multi-block attr to each application (OFBIZ-11706)

1. Bug Fix
2. Disable multi-block until function is stabilized.
---
 .../src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java
index 221bd85..36d4742 100644
--- 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java
+++ 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java
@@ -208,7 +208,7 @@ public class HtmlWidget extends ModelScreenWidget {
 @Override
 public void renderWidgetString(Appendable writer, Map 
context, ScreenStringRenderer screenStringRenderer) throws IOException {
 
-if (isMultiBlock()) {
+if (false && isMultiBlock()) {
 
 StringWriter stringWriter = new StringWriter();
 context.put("MultiBlockWriter", stringWriter);
@@ -250,7 +250,7 @@ public class HtmlWidget extends ModelScreenWidget {
 }
 
 // check for external script
-String externalScripts = 
doc.head().select("script").toString();
+String externalScripts = 
doc.body().select("script").toString();
 writer.append(externalScripts);
 
 // the 'template' block

[ofbiz-framework] 15/28: Fixed: paginateOrderList does not find orders on next page specific to FindOrders.ftl (OFBIZ-11356) Adding the missing showAll flag in the paginateOrder form because of which

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch 
ecomify-OFBIZ-11468_Convert_ShipmentReceiptServices-squashed
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 71b4abe7a6dd28f9b0029f9f08c14438b1c5d216
Author: Aditya Sharma 
AuthorDate: Sat May 23 16:18:28 2020 +0530

Fixed: paginateOrderList does not find orders on next page specific to 
FindOrders.ftl
(OFBIZ-11356)
Adding the missing showAll flag in the paginateOrder form because of which 
the orders were not shown while submitting the next button.
Thanks Michael Brohl for reporting the issue and Ankit Joshi for providing 
the patch
---
 applications/order/template/order/FindOrders.ftl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applications/order/template/order/FindOrders.ftl 
b/applications/order/template/order/FindOrders.ftl
index 6eaff5b..d50e07c 100644
--- a/applications/order/template/order/FindOrders.ftl
+++ b/applications/order/template/order/FindOrders.ftl
@@ -507,6 +507,7 @@ document.lookuporder.orderId.focus();
   
   
   
+  
   <#if paramIdList?? && paramIdList?has_content>
 <#list paramIdList as paramIds>
   <#assign paramId = paramIds.split("=")/>

[ofbiz-framework] 21/28: Improved: Converted createDownloadContent, updateDownloadContent services from mini-lang to groovy. (OFBIZ-11372)(OFBIZ-11373) Thanks Devanshu Vyas for reporting, Harman Kaur

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch 
ecomify-OFBIZ-11468_Convert_ShipmentReceiptServices-squashed
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 0caf66d514bafd5d3d2eacde2bc68ea439aa7f47
Author: Suraj Khurana 
AuthorDate: Mon May 25 13:37:16 2020 +0530

Improved: Converted createDownloadContent,updateDownloadContent services 
from mini-lang to groovy.
(OFBIZ-11372)(OFBIZ-11373)
Thanks Devanshu Vyas for reporting, Harman Kaur and Rahul for initial 
patch, Pawan for review.
---
 .../groovyScripts/content/ContentServices.groovy | 20 +++-
 .../content/minilang/content/ContentServices.xml | 19 ---
 applications/content/servicedef/services.xml |  4 ++--
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/applications/content/groovyScripts/content/ContentServices.groovy 
b/applications/content/groovyScripts/content/ContentServices.groovy
index fef62e4..c9680dd 100644
--- a/applications/content/groovyScripts/content/ContentServices.groovy
+++ b/applications/content/groovyScripts/content/ContentServices.groovy
@@ -18,7 +18,7 @@
  */
 
 import java.sql.Timestamp
- 
+
 import org.apache.ofbiz.common.UrlServletHelper
 import org.apache.ofbiz.entity.condition.EntityCondition
 import org.apache.ofbiz.entity.condition.EntityOperator
@@ -340,4 +340,22 @@ def setContentStatus() {
 return failure("No Content is not available in the system with content 
ID - " + parameters.contentId)
 }
 return resultMap
+}
+def createDownloadContent() {
+Map serviceResult = success()
+result = runService("createOtherDataResource", [dataResourceContent : 
parameters.file])
+if (ServiceUtil.isError(result)) return result
+Map serviceCtx = 
dispatcher.dispatchContext.makeValidContext("createContent", 
ModelService.IN_PARAM, parameters)
+serviceCtx.dataResourceId = result.dataResourceId
+result = runService("createContent", serviceCtx)
+if (ServiceUtil.isError(result)) return result
+serviceResult.contentId = result.contentId
+return serviceResult;
+}
+def updateDownloadContent() {
+Map result = success()
+if(parameters.fileDataResourceId) {
+result = runService("updateOtherDataResource", [dataResourceId: 
parameters.fileDataResourceId, dataResourceContent: parameters.file])
+}
+return result
 }
\ No newline at end of file
diff --git a/applications/content/minilang/content/ContentServices.xml 
b/applications/content/minilang/content/ContentServices.xml
index d920e1d..3ff187f 100644
--- a/applications/content/minilang/content/ContentServices.xml
+++ b/applications/content/minilang/content/ContentServices.xml
@@ -209,25 +209,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
diff --git a/applications/content/servicedef/services.xml 
b/applications/content/servicedef/services.xml
index 43fede2..71a6b6c 100644
--- a/applications/content/servicedef/services.xml
+++ b/applications/content/servicedef/services.xml
@@ -143,7 +143,7 @@
 
 
 
-
+
 
 
 
@@ -153,7 +153,7 @@
 
 
 
-
+

[ofbiz-framework] 22/28: Improved: downgrades tasks.checkstyleMain.maxErrors to stop failures in Buildbot

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch 
ecomify-OFBIZ-11468_Convert_ShipmentReceiptServices-squashed
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 260ae0fb4f65c5c1d28db388658c6f10c290bcb6
Author: Jacques Le Roux 
AuthorDate: Sun May 24 12:37:41 2020 +0200

Improved: downgrades tasks.checkstyleMain.maxErrors to stop failures in 
Buildbot
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ebbbce1..e6ef484 100644
--- a/build.gradle
+++ b/build.gradle
@@ -286,7 +286,7 @@ checkstyle {
 // the sum of errors found last time it was changed after using the
 // ‘checkstyle’ tool present in the framework and in the official
 // plugins.
-tasks.checkstyleMain.maxErrors = 37096
+tasks.checkstyleMain.maxErrors = 37101
 // Currently there are a lot of errors so we need to temporarily
 // hide them to avoid polluting the terminal output.
 showViolations = false

[ofbiz-framework] branch release18.12 updated: Improved: adds pull_request_template.md (OFBIZ-11722)

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release18.12 by this push:
 new 9e2c7a1  Improved: adds pull_request_template.md (OFBIZ-11722)
9e2c7a1 is described below

commit 9e2c7a10a414b8bb102018635169efbc0eab6c18
Author: Jacques Le Roux 
AuthorDate: Wed May 27 20:42:16 2020 +0200

Improved: adds pull_request_template.md (OFBIZ-11722)

Forgot to commit the replacement
---
 .github/pull_request_template.md | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 000..d106097
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,11 @@
+Improved:
+Implemented:
+Documented:
+Completed:
+Reverted:
+Fixed:
+(OFBIZ-)
+
+Explanation
+
+Thanks:

[ofbiz-framework] 06/28: Improved: just remove trailing space

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch 
ecomify-OFBIZ-11468_Convert_ShipmentReceiptServices-squashed
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit ffede15c589ed6e0ac7d7635e2cae4a0ddf5e478
Author: holivier 
AuthorDate: Fri May 22 11:44:23 2020 +0200

Improved: just remove trailing space
---
 framework/widget/dtd/widget-form.xsd | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/framework/widget/dtd/widget-form.xsd 
b/framework/widget/dtd/widget-form.xsd
index 68a9829..9eb3efd 100644
--- a/framework/widget/dtd/widget-form.xsd
+++ b/framework/widget/dtd/widget-form.xsd
@@ -168,9 +168,9 @@ under the License.
 
 
 
-The total number of rows in the original 
list (used for pagination). 
+The total number of rows in the original 
list (used for pagination).
   If not specified, the size of the list 
will be used. Accepts ${} notation.
-  You may use any value, true makes sense, 
when using performFindList, but one value must be passed. 
+  You may use any value, true makes sense, 
when using performFindList, but one value must be passed.
 
 
 
@@ -659,9 +659,9 @@ under the License.
 
 
 
-The name of this field that will be shown to the user. 
+The name of this field that will be shown to the user.
 It can use the ${} and foo.bar (dot) syntax to insert 
values from the context for parameterization or internationalization.
-
+
 Be sure a "FormFieldTitle_" labels does not already 
exist, else it will be overridden.
 
 
@@ -1035,7 +1035,7 @@ under the License.
 
 
 
-This is just like display but looks up a description using the 
Entity Engine; 
+This is just like display but looks up a description using the 
Entity Engine;
 note that if also-hidden is true then it uses the key as the 
value, not the shown description.
 
 
@@ -1049,7 +1049,7 @@ under the License.
 
 
 
-Specifies the size of the field (as a number of 
characters), 
+Specifies the size of the field (as a number of 
characters),
 when the text to display exceed the given size it is 
truncated and add the complete text as a hint
  
 
@@ -1231,7 +1231,7 @@ under the License.
   type="xs:boolean" default="true">
 
 
-Tells the browser whether or not to try and 
autocomplete with values previously entered. 
+Tells the browser whether or not to try and 
autocomplete with values previously entered.
 Default to true.
 
 
@@ -1244,7 +1244,7 @@ under the License.
 
 
 
-Shows the lookup as moveable and resizable layer or 
popup window. 
+Shows the lookup as moveable and resizable layer or 
popup window.
 if set to none only autocompletion is active (no 
lookup form would be call)
 Default to layer.
 
@@ -1295,8 +1295,8 @@ under the License.
 
 
 
-If true, a special span with css class 
"tooltip" will be created at right of the lookup button 
-and a description will fill in. 
+If true, a special span with css class 
"tooltip" will be created at right of the lookup button
+and a description will fill in.
 If not set then it depends on the 
"widget.lookup.showDescription" setting.

[ofbiz-framework] 11/28: Improved: Convert setContentStatus service from mini-lang to groovy DSL(OFBIZ-11365). Thanks Devanshu Vyas for the contribution.

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch 
ecomify-OFBIZ-11468_Convert_ShipmentReceiptServices-squashed
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit ae2585c32d5d7ef475d7d2d42bed86b360350373
Author: Mridul Pathak 
AuthorDate: Sat May 23 18:12:13 2020 +0530

Improved: Convert setContentStatus service from mini-lang to groovy 
DSL(OFBIZ-11365). Thanks Devanshu Vyas for the contribution.
---
 .../groovyScripts/content/ContentServices.groovy   | 22 ++
 .../content/minilang/content/ContentServices.xml   | 26 --
 .../content/servicedef/services_content.xml|  4 ++--
 3 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/applications/content/groovyScripts/content/ContentServices.groovy 
b/applications/content/groovyScripts/content/ContentServices.groovy
index 4ecc039..fef62e4 100644
--- a/applications/content/groovyScripts/content/ContentServices.groovy
+++ b/applications/content/groovyScripts/content/ContentServices.groovy
@@ -319,3 +319,25 @@ def createArticleContent() {
 result.contentId = contentId
 return result
 }
+
+def setContentStatus() {
+Map resultMap = new HashMap()
+content = from("Content").where("contentId", 
parameters.contentId).queryOne()
+if (content) {
+oldStatusId = content.statusId
+resultMap.oldStatusId = oldStatusId
+if (!oldStatusId.equals(parameters.statusId)) {
+statusChange = from("StatusValidChange").where("statusId", 
oldStatusId, "statusIdTo", parameters.statusId).queryOne()
+if (statusChange) {
+content.put("statusId", parameters.statusId)
+content.store()
+} else {
+resultMap.errorMessage = "Cannot change from " + oldStatusId + 
" to " + parameters.statusId
+logError(resultMap.errorMessage)
+}
+}
+} else {
+return failure("No Content is not available in the system with content 
ID - " + parameters.contentId)
+}
+return resultMap
+}
\ No newline at end of file
diff --git a/applications/content/minilang/content/ContentServices.xml 
b/applications/content/minilang/content/ContentServices.xml
index b8e451b..d920e1d 100644
--- a/applications/content/minilang/content/ContentServices.xml
+++ b/applications/content/minilang/content/ContentServices.xml
@@ -46,32 +46,6 @@
 
 
 
-
-
-
-
-
-
-   
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
diff --git a/applications/content/servicedef/services_content.xml 
b/applications/content/servicedef/services_content.xml
index ee931fa..a85b902 100644
--- a/applications/content/servicedef/services_content.xml
+++ b/applications/content/servicedef/services_content.xml
@@ -288,8 +288,8 @@
 
 
 
-
+
 Set the Content Status

[ofbiz-framework] 26/28: Documented: datamodel markdown migration to asciidoc (OFBIZ-11574)

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch 
ecomify-OFBIZ-11468_Convert_ShipmentReceiptServices-squashed
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit db463e7517450e54a32b63fef834ff209a39eeb1
Author: Aditya Sharma 
AuthorDate: Mon May 25 19:46:04 2020 +0530

Documented: datamodel markdown migration to asciidoc (OFBIZ-11574)

* Documented: datamodel markdown migration to asciidoc
(OFBIZ-11574)

- DATAMODEL_CHANGE migration to asciidoc and add a included in
developer_manual
- Readme migration to asciidoc

* Documented: theme/README.md change theme/README.adoc but with very
simple content
(OFBIZ-11574)

README.md  has been migrated to asciidoc as doc/themes.adoc previously
but remove README.md has been forgot.
In this commit README.md is removed and a new README.adoc is created
with only a brief component definition and link to the theme
documentation (and developer-manual which included theme.adoc)

* Documented: datamodel markdown migration to asciidoc
(OFBIZ-11574)

Added new field parentGlXbrlClassId taking reference from 
DATAMODEL_CHANGES.md which was added with OFBIZ-10613 and missing in adoc file

Co-authored-by: holivier 
---
 applications/datamodel/DATAMODEL_CHANGES.adoc | 416 ++
 applications/datamodel/DATAMODEL_CHANGES.md   | 402 -
 applications/datamodel/README.adoc|  36 +++
 applications/datamodel/README.md  |  14 -
 docs/asciidoc/developer-manual.adoc   |   2 +
 themes/README.adoc|  28 ++
 themes/README.md  | 314 ---
 7 files changed, 482 insertions(+), 730 deletions(-)

diff --git a/applications/datamodel/DATAMODEL_CHANGES.adoc 
b/applications/datamodel/DATAMODEL_CHANGES.adoc
new file mode 100644
index 000..ca21746
--- /dev/null
+++ b/applications/datamodel/DATAMODEL_CHANGES.adoc
@@ -0,0 +1,416 @@
+
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+
+= Data Model Changes
+The Apache OFBiz® Project
+Release 17.12
+
+Apache OFBiz follows *The Universal Data Model* by **Len Silverston**, with a 
grain of salt.
+
+The following file contains information about the data model changes in the 
Apache OFBiz.
+ The detailed description of migration scripts specified here can be found at
+ https://cwiki.apache.org/confluence/x/LoBr[Revisions Requiring Data Migration 
- upgrade ofbiz] page.
+
+== Changes with OFBiz Trunk (Upcoming Branch)
+
+=== Entity Changes
+*Added 1 new entity*
+
+1. ProdPromoCodeContactMech
+
+*Removed/Deprecate 1 entity*
+
+1. ProductPromoCodeEmail
+
+=== Field Changes
+[cols="<,^,^,^,>",options="header",]
+|===
+|Entity |Field   |Action |IsPK |Revision
+| GlXbrlClass | parentGlXbrlClassId | Added | No | 36a123a
+|===
+
+
+=== Migration Scripts
+1.  Migration service migrateProductPromoCodeEmail is implemented to migrate 
the
+ProductPromoCodeEmail entity to ProductPromoCodeContactMech. +
+(More detail at 
https://issues.apache.org/jira/browse/OFBIZ-5426[OFBIZ-5426])
+
+== Changes with OFBiz 17
+Field types `id-ne`, `id-long-ne` & `id-vlong-ne` has been removed. Use `id`, 
`id-long` and `id-vlong`
+instead (detailed description at 
https://issues.apache.org/jira/browse/OFBIZ-9351[OFBIZ-9351]).
+
+
+=== Entity Changes
+No changes
+
+=== Field Changes
+[cols="<,^,^,^,>",options="header",]
+|===
+|Entity |Field   |Action |IsPK |Revision
+|MarketingCampaignPrice |fromDate |Added |Yes |R1805961
+|MarketingCampaignPrice |thruDate |Added |No |R1805961
+|MarketingCampaignPromo |fromDate |Added |Yes |R1805961
+|MarketingCampaignPromo |thruDate |Added |No |R1805961
+|MarketingCampaignRole |fromDate |Added |Yes |R1805961
+|MarketingCampaignRole |thruDate |Added |No |R1805961
+|Product |manufacturerPartyId |Removed |No |R1804408
+|SecurityGroupPermission |fromDate |Added |Yes |R1812383
+|SecurityGroupPermission |thruDate |Added |No |R1812383

[ofbiz-framework] 02/28: Improved: Clean how HTTP vs HTTPS is handled

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch 
ecomify-OFBIZ-11468_Convert_ShipmentReceiptServices-squashed
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 39d0b91ea14fb80bf1a4a9cb60c19ed95a540f9d
Author: Jacques Le Roux 
AuthorDate: Wed May 20 13:01:22 2020 +0200

Improved: Clean how HTTP vs HTTPS is handled

(OFBIZ-11717)

No functional changes, just better comments
---
 .../java/org/apache/ofbiz/webapp/control/RequestHandler.java  | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git 
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
 
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
index b17a55b..d9a5251 100644
--- 
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
+++ 
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
@@ -323,12 +323,14 @@ public class RequestHandler {
 // Check if we SHOULD be secure and are not.
 boolean forwardedHTTPS = 
"HTTPS".equalsIgnoreCase(request.getHeader("X-Forwarded-Proto"));
 if (!request.isSecure() && !forwardedHTTPS && 
requestMap.securityHttps) {
-// If the request method was POST then return an error to 
avoid problems with XSRF where the request may have come from another 
machine/program and had the same session ID but was not encrypted as it should 
have been (we used to let it pass to not lose data since it was too late to 
protect that data anyway)
+// If the request method was POST then return an error to 
avoid problems with CSRF where the request 
+// may have come from another machine/program and had the same 
session ID but was not encrypted as it 
+// should have been (we used to let it pass to not lose data 
since it was too late to protect that data anyway)
 if ("POST".equalsIgnoreCase(request.getMethod())) {
-// we can't redirect with the body parameters, and for 
better security from XSRF, just return an error message
+// we can't redirect with the body parameters, and for 
better security from CSRF, just return an error message
 Locale locale = UtilHttp.getLocale(request);
 String errMsg = 
UtilProperties.getMessage("WebappUiLabels", 
"requestHandler.InsecureFormPostToSecureRequest", locale);
-Debug.logError("Got a insecure (non-https) form POST to a 
secure (http) request [" + requestMap.uri + "], returning error", MODULE);
+Debug.logError("Got an insecure (non HTTPS) form POST to a 
secure (HTTPS) request [" + requestMap.uri + "], returning error", MODULE);
 
 // see if HTTPS is enabled, if not then log a warning 
instead of throwing an exception
 Boolean enableHttps = null;
@@ -346,7 +348,8 @@ public class RequestHandler {
 }
 
 if (Boolean.FALSE.equals(enableHttps)) {
-Debug.logWarning("HTTPS is disabled for this site, so 
we can't tell if this was encrypted or not which means if a form was POSTed and 
it was not over HTTPS we don't know, but it would be vulnerable to an XSRF and 
other attacks: " + errMsg, MODULE);
+Debug.logWarning("HTTPS is disabled for this site, so 
we can't tell if this was encrypted or not which means if a form was POSTed "
++ "and it was not over HTTPS we don't know, 
but it would be vulnerable to an CSRF and other attacks: " + errMsg, MODULE);
 } else {
 throw new RequestHandlerException(errMsg);
 }

[ofbiz-framework] 01/28: Fixed: Entering manually date in date-time field become unworkable (OFBIZ-10432)

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch 
ecomify-OFBIZ-11468_Convert_ShipmentReceiptServices-squashed
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 3f6e976c208718308a985f11b0ee1c52ef2159f7
Author: Pawan Verma 
AuthorDate: Wed May 20 14:26:52 2020 +0530

Fixed: Entering manually date in date-time field become unworkable
(OFBIZ-10432)

Thanks, Olivier for the report.
---
 themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl 
b/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
index fa549ea..ea4763d 100644
--- a/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
+++ b/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
@@ -84,7 +84,7 @@ under the License.
 <#if tabindex?has_content> tabindex="${tabindex}"<#rt/>
 <#if visualEditorEnable?has_content> 
data-toolbar="${buttons?default("maxi")}"<#rt/>
 <#if language?has_content> data-language="${language!"en"}"<#rt/>
-<#if disabled?has_content> disabled="${disabled}"<#rt/>
+<#if disabled?has_content && disabled> disabled="disabled"<#rt/>
 ><#t/>
 <#if value?has_content>${value}<#t/>
   <#lt/>
@@ -98,7 +98,7 @@ under the License.
 <#if value?has_content> value="${value}"
 <#if size?has_content> size="${size}"<#rt/>
 <#if maxlength?has_content>  maxlength="${maxlength}"
-<#if disabled?has_content> disabled="${disabled}"<#rt/>
+<#if disabled?has_content && disabled> disabled="disabled"<#rt/>
 <#if id?has_content> id="${id}_i18n"/><#rt/>
 <#local className = className + " date-time-picker"/>
 
@@ -198,7 +198,7 @@ under the License.
   <#list items as item>
 ><#rt/>
   <#if 
currentValue==item.key> checked="checked"<#if tabindex?has_content> 
tabindex="${tabindex}"<#rt/>
-<#elseif noCurrentSelectedKey?has_content && noCurrentSelectedKey == 
item.key> checked="checked"<#if disabled?has_content> 
disabled="${disabled}"
+<#elseif noCurrentSelectedKey?has_content && noCurrentSelectedKey == 
item.key> checked="checked"<#if disabled?has_content && disabled> 
disabled="disabled"
 name="${name?default("")?html}" 
value="${item.key?default("")?html}"<#if event?has_content> 
${event}="${action}"/><#rt/>
   ${item.description}

[ofbiz-framework] branch ecomify-OFBIZ-11468_Convert_ShipmentReceiptServices-squashed created (now 2ff8190)

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a change to branch 
ecomify-OFBIZ-11468_Convert_ShipmentReceiptServices-squashed
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git.


  at 2ff8190  Improved: removes useless "@deprecated No replacement" 
comments in Java code

This branch includes the following new commits:

 new 3f6e976  Fixed: Entering manually date in date-time field become 
unworkable (OFBIZ-10432)
 new 39d0b91  Improved: Clean how HTTP vs HTTPS is handled
 new 1f44bcd  Improved: Apply multi-block attr to each application 
(OFBIZ-11706)
 new 2621fd4  Fixed: showjGrowl called twice (OFBIZ-11720)
 new c020b56  Improved: Apply multi-block attr to each application 
(OFBIZ-11706)
 new ffede15  Improved: just remove trailing space
 new fa1c0eb  Improved: Converted getPaymentRunningTotal service from 
mini-lang to groovy DSL (OFBIZ-11488) Thanks Nitish Mishra for the patch and 
Devanshu Vyas for reporting and review.
 new a45f0f2  Improved: Refactor simple methods names as per naming 
convention best practices. (#137)
 new 05640f7  Improved: Apply multi-block attr to each application 
(OFBIZ-11706)
 new 3e4a2ec  Improved: Converted createPaymentContent, 
updatePaymentContent services from mini-lang to groovy. (#155)
 new ae2585c  Improved: Convert setContentStatus service from mini-lang to 
groovy DSL(OFBIZ-11365). Thanks Devanshu Vyas for the contribution.
 new d0fb482  Improved: Converted massChangePaymentStatus service from 
mini-lang to groovy. (OFBIZ-11498) Thanks Devanshu Vyas for reporting and 
Rushikesh Mawal for initial patch.
 new d5c7151  Improved: Converted createPaymentAndApplicationForParty 
service from mini-lang to groovy (OFBIZ-11491) Thanks Devanshu Vyas for 
reporting and Sourabh Punyani for providing the patch.
 new 452a893  Improved: Make shipment services loosely coupled with 
work-effort generation. (#132)
 new 71b4abe  Fixed: paginateOrderList does not find orders on next page 
specific to FindOrders.ftl (OFBIZ-11356) Adding the missing showAll flag in the 
paginateOrder form because of which the orders were not shown while submitting 
the next button. Thanks Michael Brohl for reporting the issue and Ankit Joshi 
for providing the patch
 new 36b4837  Improved: All the service level error messages for missing 
required field for humanares component. (OFBIZ-8716) Thanks Jagpreet for 
reporting and Prasheel for providing the initial patch
 new 835de70  Improved: Converted updatePayment service from mini-lang to 
groovy. (OFBIZ-11480) Thanks Devanshu Vyas for reporting and Priya Sharma for 
the patch.
 new 335b346  Fixed: Requesthandler exception is showing after clicking 
cancel/done button on editPerson screen (OFBIZ-10890) Set the value of missing 
parameter. Thanks Minal Phalak for reporting and providing the patch
 new c759ccd  Fixed: RuntimeException in getPartyNameForDate service for 
partyNameHistory.gender field(OFBIZ-11736)
 new 8a290d3  Improved: Added UI labels for success/error messages for 
humanres, marketing, order component. (OFBIZ-7696) Thanks Deepak Nigam for 
reporting and Sourabh Punyani for the patch.
 new 0caf66d  Improved: Converted 
createDownloadContent,updateDownloadContent services from mini-lang to groovy. 
(OFBIZ-11372)(OFBIZ-11373) Thanks Devanshu Vyas for reporting, Harman Kaur and 
Rahul for initial patch, Pawan for review.
 new 260ae0f  Improved: downgrades tasks.checkstyleMain.maxErrors to stop 
failures in Buildbot
 new ae3f166  Improved: quote menu
 new 7603d5c  Improved: Improved: Changed lineSplit value to 150. 
(OFBIZ-11737) Earlier it was 120, as per discussion over ML we decided to make 
it 150 instead.
 new 4f07148  Fixed: organisation tree in humanres doesn't show person 
names (OFBIZ-11677) (#121)
 new db463e7  Documented: datamodel markdown migration to asciidoc 
(OFBIZ-11574)
 new 9c54082  Improved: instructions to upgrade due to datamodel changes 
(OFBIZ-11719) (#162)
 new 2ff8190  Improved: removes useless "@deprecated No replacement" 
comments in Java code

The 28 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[ofbiz-framework] 07/28: Improved: Converted getPaymentRunningTotal service from mini-lang to groovy DSL (OFBIZ-11488) Thanks Nitish Mishra for the patch and Devanshu Vyas for reporting and review.

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch 
ecomify-OFBIZ-11468_Convert_ShipmentReceiptServices-squashed
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit fa1c0ebd83e21cb2daa08a49e7637b4e7a7996f0
Author: Suraj Khurana 
AuthorDate: Sat May 23 10:27:50 2020 +0530

Improved: Converted getPaymentRunningTotal service from mini-lang to groovy 
DSL
(OFBIZ-11488)
Thanks Nitish Mishra for the patch and Devanshu Vyas for reporting and 
review.
---
 .../groovyScripts/payment/PaymentServices.groovy   | 37 ++
 .../minilang/payment/PaymentServices.xml   | 21 
 .../accounting/servicedef/services_payment.xml |  4 +--
 3 files changed, 39 insertions(+), 23 deletions(-)

diff --git 
a/applications/accounting/groovyScripts/payment/PaymentServices.groovy 
b/applications/accounting/groovyScripts/payment/PaymentServices.groovy
index 56c653b..b71c419 100644
--- a/applications/accounting/groovyScripts/payment/PaymentServices.groovy
+++ b/applications/accounting/groovyScripts/payment/PaymentServices.groovy
@@ -18,7 +18,10 @@
  */
 import org.apache.ofbiz.base.util.Debug
 import org.apache.ofbiz.base.util.UtilDateTime
+import org.apache.ofbiz.base.util.UtilFormatOut
 import org.apache.ofbiz.base.util.UtilProperties
+import org.apache.ofbiz.entity.condition.EntityCondition
+import org.apache.ofbiz.entity.condition.EntityOperator
 import org.apache.ofbiz.entity.GenericValue
 
 MODULE = "PaymentServices.groovy"
@@ -57,3 +60,37 @@ def createPayment() {
 result.paymentId = paymentId
 return result
 }
+
+def getPaymentRunningTotal(){
+paymentIds = parameters.paymentIds;
+runningTotal = 0;
+payments = 
from("Payment").where(EntityCondition.makeCondition("paymentId", 
EntityOperator.IN, paymentIds)).queryList()
+if (payments) {
+for (GenericValue payment : payments) {
+runningTotal = runningTotal + payment.amount;
+}
+}
+
+if (parameters.organizationPartyId) {
+serviceCtx = [
+organizationPartyId: parameters.organizationPartyId,
+userLogin: userLogin
+]
+serviceResult = dispatcher.runSync('getPartyAccountingPreferences', 
serviceCtx);
+partyAcctgPreference = serviceResult.partyAccountingPreference;
+
+if (partyAcctgPreference.baseCurrencyUomId) {
+currencyUomId = partyAcctgPreference.baseCurrencyUomId;
+} else {
+currencyUomId = 
UtilProperties.getPropertyValue('general.properties', 
'currency.uom.id.default');
+}
+} else  {
+currencyUomId = UtilProperties.getPropertyValue('general.properties', 
'currency.uom.id.default');
+}
+
+paymentRunningTotal = UtilFormatOut.formatCurrency(runningTotal, 
currencyUomId, locale);
+
+result = success()
+result.paymentRunningTotal = paymentRunningTotal
+return result
+}
diff --git a/applications/accounting/minilang/payment/PaymentServices.xml 
b/applications/accounting/minilang/payment/PaymentServices.xml
index 3d6f961..3811bf7 100644
--- a/applications/accounting/minilang/payment/PaymentServices.xml
+++ b/applications/accounting/minilang/payment/PaymentServices.xml
@@ -512,27 +512,6 @@ under the License.
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
diff --git a/applications/accounting/servicedef/services_payment.xml 
b/applications/accounting/servicedef/services_payment.xml
index ba0cacd..a7d9554 100644
--- a/applications/accounting/servicedef/services_payment.xml
+++ b/applications/accounting/servicedef/services_payment.xml
@@ -151,8 +151,8 @@ under the License.
 
 
 
-
+
 calculate running total for payments

[ofbiz-framework] 12/28: Improved: Converted massChangePaymentStatus service from mini-lang to groovy. (OFBIZ-11498) Thanks Devanshu Vyas for reporting and Rushikesh Mawal for initial patch.

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch 
ecomify-OFBIZ-11468_Convert_ShipmentReceiptServices-squashed
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit d0fb482257128b5471bb71f15218fcd6057a495c
Author: Suraj Khurana 
AuthorDate: Sat May 23 15:23:13 2020 +0530

Improved: Converted massChangePaymentStatus service from mini-lang to 
groovy.
(OFBIZ-11498)
Thanks Devanshu Vyas for reporting and Rushikesh Mawal for initial patch.
---
 .../accounting/groovyScripts/payment/PaymentServices.groovy | 13 +
 .../accounting/minilang/payment/PaymentServices.xml | 10 --
 applications/accounting/servicedef/services_payment.xml |  4 ++--
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git 
a/applications/accounting/groovyScripts/payment/PaymentServices.groovy 
b/applications/accounting/groovyScripts/payment/PaymentServices.groovy
index c28ce07..212207d 100644
--- a/applications/accounting/groovyScripts/payment/PaymentServices.groovy
+++ b/applications/accounting/groovyScripts/payment/PaymentServices.groovy
@@ -133,4 +133,17 @@ def updatePaymentContent() {
 return ServiceUtil.returnError("Error getting Payment Content")
 }
 }
+def massChangePaymentStatus() {
+serviceResult = success()
+Map setPaymentStatusMap = [:]
+parameters.paymentIds.each{ paymentId ->
+setPaymentStatusMap.paymentId = paymentId
+setPaymentStatusMap.statusId = parameters.statusId
+setPaymentStatusMap.userLogin = parameters.userLogin
+result = run service: 'setPaymentStatus', with: setPaymentStatusMap
+if (ServiceUtil.isError(result)) return result
+setPaymentStatusMap.clear()
+}
+return serviceResult
+}
 
diff --git a/applications/accounting/minilang/payment/PaymentServices.xml 
b/applications/accounting/minilang/payment/PaymentServices.xml
index 1c32621..ae862251 100644
--- a/applications/accounting/minilang/payment/PaymentServices.xml
+++ b/applications/accounting/minilang/payment/PaymentServices.xml
@@ -785,16 +785,6 @@ under the License.
 
 
 
-
-
-
-
-
-
-
-
-
-
 
 
 
diff --git a/applications/accounting/servicedef/services_payment.xml 
b/applications/accounting/servicedef/services_payment.xml
index dd9b2cd..e1c8344 100644
--- a/applications/accounting/servicedef/services_payment.xml
+++ b/applications/accounting/servicedef/services_payment.xml
@@ -227,8 +227,8 @@ under the License.
 
 
 
-
+
 Set status of Payments in bulk.

[ofbiz-framework] 05/28: Improved: Apply multi-block attr to each application (OFBIZ-11706)

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch 
ecomify-OFBIZ-11468_Convert_ShipmentReceiptServices-squashed
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit c020b56dfee923091f2fb7e3359477ffa5414b8c
Author: James Yong 
AuthorDate: Fri May 22 00:54:20 2020 +0800

Improved: Apply multi-block attr to each application (OFBIZ-11706)

1. Fix missing Boundary Comment at beginning
2. Apply multi-block attr
---
 .../widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java  | 2 +-
 themes/common-theme/widget/CommonScreens.xml| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java
index 9acdbf2..221bd85 100644
--- 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java
+++ 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/HtmlWidget.java
@@ -217,7 +217,7 @@ public class HtmlWidget extends ModelScreenWidget {
 String data = stringWriter.toString();
 stringWriter.close();
 
-Document doc = Jsoup.parse(data);
+Document doc = Jsoup.parseBodyFragment(data);
 
 // extract scripts
 Elements scriptElements = doc.select("script");
diff --git a/themes/common-theme/widget/CommonScreens.xml 
b/themes/common-theme/widget/CommonScreens.xml
index a7655d4..9c9172b 100644
--- a/themes/common-theme/widget/CommonScreens.xml
+++ b/themes/common-theme/widget/CommonScreens.xml
@@ -271,7 +271,7 @@ under the License.
 
 
 
-
+

[ofbiz-framework] 27/28: Improved: instructions to upgrade due to datamodel changes (OFBIZ-11719) (#162)

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch 
ecomify-OFBIZ-11468_Convert_ShipmentReceiptServices-squashed
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 9c540826486499ea1d0a206acbf2af424078ead3
Author: Pierre Smits 
AuthorDate: Tue May 26 13:51:05 2020 +0200

Improved: instructions to upgrade due to datamodel changes (OFBIZ-11719) 
(#162)
---
 applications/datamodel/DATAMODEL_CHANGES.adoc | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/applications/datamodel/DATAMODEL_CHANGES.adoc 
b/applications/datamodel/DATAMODEL_CHANGES.adoc
index ca21746..44e017f 100644
--- a/applications/datamodel/DATAMODEL_CHANGES.adoc
+++ b/applications/datamodel/DATAMODEL_CHANGES.adoc
@@ -43,7 +43,18 @@ The following file contains information about the data model 
changes in the Apac
 |Entity |Field   |Action |IsPK |Revision
 | GlXbrlClass | parentGlXbrlClassId | Added | No | 36a123a
 |===
+If in the list above fields are mentioned where 'IsPK' = yes, we advice to 
follow steps below for a successful upgrade:
 
+. Stop your OFBiz implementation
+. Go to the entity definition in the appropriate entitymodel.xml file
+. Disable temporarily the prim-key reference of the added field, and save the 
file
+. Restart the OFBiz implementation
+. Check with your RDBMS client that the new field is present in the table
+. Add values for the field in the table (if appropriate)
+. Stop the OFBiz implementation
+. Go back to the definition in the appropriate entitymodel.xml file
+. Enable the temporary disabled prim-key reference of the added field, and 
save the file
+. Check with your RDBMS client that the new field is part of the primary key 
defintion of the table
 
 === Migration Scripts
 1.  Migration service migrateProductPromoCodeEmail is implemented to migrate 
the

[ofbiz-framework] 18/28: Fixed: Requesthandler exception is showing after clicking cancel/done button on editPerson screen (OFBIZ-10890) Set the value of missing parameter. Thanks Minal Phalak for rep

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch 
ecomify-OFBIZ-11468_Convert_ShipmentReceiptServices-squashed
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 335b3462c9406cf17584c8010ca808c53196dc4f
Author: Aditya Sharma 
AuthorDate: Sat May 23 17:32:16 2020 +0530

Fixed: Requesthandler exception is showing after clicking cancel/done 
button on editPerson screen
(OFBIZ-10890)
Set the value of missing parameter.
Thanks Minal Phalak for reporting and providing the patch
---
 applications/party/widget/partymgr/PartyScreens.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applications/party/widget/partymgr/PartyScreens.xml 
b/applications/party/widget/partymgr/PartyScreens.xml
index 0e65511..460522f 100644
--- a/applications/party/widget/partymgr/PartyScreens.xml
+++ b/applications/party/widget/partymgr/PartyScreens.xml
@@ -75,6 +75,7 @@ under the License.
 
 
 
+

[ofbiz-framework] 03/28: Improved: Apply multi-block attr to each application (OFBIZ-11706)

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch 
ecomify-OFBIZ-11468_Convert_ShipmentReceiptServices-squashed
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 1f44bcda85741c3e981a98e7204360541ed9d9af
Author: James Yong 
AuthorDate: Thu May 21 00:07:36 2020 +0800

Improved: Apply multi-block attr to each application (OFBIZ-11706)

Revert regression for showHelp.
---
 themes/common-theme/template/includes/LookupFooter.ftl | 1 +
 themes/common-theme/widget/CommonScreens.xml   | 2 +-
 themes/common-theme/widget/HelpScreens.xml | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/themes/common-theme/template/includes/LookupFooter.ftl 
b/themes/common-theme/template/includes/LookupFooter.ftl
index 638bbdf..1c9f388 100644
--- a/themes/common-theme/template/includes/LookupFooter.ftl
+++ b/themes/common-theme/template/includes/LookupFooter.ftl
@@ -17,4 +17,5 @@ specific language governing permissions and limitations
 under the License.
 -->
   
+  <@scriptTemplateList/>
 
diff --git a/themes/common-theme/widget/CommonScreens.xml 
b/themes/common-theme/widget/CommonScreens.xml
index b02d774..a7655d4 100644
--- a/themes/common-theme/widget/CommonScreens.xml
+++ b/themes/common-theme/widget/CommonScreens.xml
@@ -368,7 +368,7 @@ under the License.
 
 
 
-
+
 
 
 
diff --git a/themes/common-theme/widget/HelpScreens.xml 
b/themes/common-theme/widget/HelpScreens.xml
index 0c9563c..7385377 100644
--- a/themes/common-theme/widget/HelpScreens.xml
+++ b/themes/common-theme/widget/HelpScreens.xml
@@ -30,7 +30,7 @@ under the License.
 
 
 
-
+

[ofbiz-framework] 10/28: Improved: Converted createPaymentContent, updatePaymentContent services from mini-lang to groovy. (#155)

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch 
ecomify-OFBIZ-11468_Convert_ShipmentReceiptServices-squashed
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 3e4a2ecd1a2fb114ae1acb77abac6a5be892109b
Author: Suraj Khurana <64310724+surajkhur...@users.noreply.github.com>
AuthorDate: Sat May 23 12:38:07 2020 +0530

Improved: Converted createPaymentContent, updatePaymentContent services 
from mini-lang to groovy. (#155)

(OFBIZ-11501)(OFBIZ-11502)
Thanks Devanshu Vyas for reporting and Sourabh Punyani for providing the 
patch.
---
 .../groovyScripts/payment/PaymentServices.groovy   | 40 ++
 .../minilang/payment/PaymentServices.xml   | 31 -
 .../accounting/servicedef/services_payment.xml |  8 ++---
 3 files changed, 44 insertions(+), 35 deletions(-)

diff --git 
a/applications/accounting/groovyScripts/payment/PaymentServices.groovy 
b/applications/accounting/groovyScripts/payment/PaymentServices.groovy
index b71c419..c28ce07 100644
--- a/applications/accounting/groovyScripts/payment/PaymentServices.groovy
+++ b/applications/accounting/groovyScripts/payment/PaymentServices.groovy
@@ -23,6 +23,8 @@ import org.apache.ofbiz.base.util.UtilProperties
 import org.apache.ofbiz.entity.condition.EntityCondition
 import org.apache.ofbiz.entity.condition.EntityOperator
 import org.apache.ofbiz.entity.GenericValue
+import org.apache.ofbiz.service.ServiceUtil
+import java.sql.Timestamp
 
 MODULE = "PaymentServices.groovy"
 def createPayment() {
@@ -94,3 +96,41 @@ def getPaymentRunningTotal(){
 result.paymentRunningTotal = paymentRunningTotal
 return result
 }
+def createPaymentContent() {
+GenericValue newEntity = delegator.makeValue("PaymentContent")
+newEntity.setPKFields(parameters, true)
+newEntity.setNonPKFields(parameters, true)
+
+if (!newEntity.fromDate) {
+Timestamp nowTimestamp = UtilDateTime.nowTimestamp()
+newEntity.fromDate  = nowTimestamp
+}
+newEntity.create()
+
+result = run service: 'updateContent', with: parameters
+if (ServiceUtil.isError(result)) return result
+
+Map result = success()
+result.contentId = newEntity.contentId
+result.paymentId = newEntity.paymentId
+result.paymentContentTypeId = newEntity.paymentContentTypeId
+return result
+}
+//TODO: This can be converted into entity-auto with a seca rule for 
updateContent
+def updatePaymentContent() {
+serviceResult = success()
+GenericValue lookupPKMap = delegator.makeValue("PaymentContent")
+lookupPKMap.setPKFields(parameters, true)
+
+GenericValue lookedUpValue = findOne("PaymentContent", lookupPKMap, false)
+if (lookedUpValue) {
+lookedUpValue.setNonPKFields(parameters)
+lookedUpValue.store()
+result = run service: 'updateContent', with: parameters
+if (ServiceUtil.isError(result)) return result
+return serviceResult
+} else {
+return ServiceUtil.returnError("Error getting Payment Content")
+}
+}
+
diff --git a/applications/accounting/minilang/payment/PaymentServices.xml 
b/applications/accounting/minilang/payment/PaymentServices.xml
index 3811bf7..1c32621 100644
--- a/applications/accounting/minilang/payment/PaymentServices.xml
+++ b/applications/accounting/minilang/payment/PaymentServices.xml
@@ -1074,35 +1074,4 @@ under the License.
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
diff --git a/applications/accounting/servicedef/services_payment.xml 
b/applications/accounting/servicedef/services_payment.xml
index a7d9554..dd9b2cd 100644
--- a/applications/accounting/servicedef/services_payment.xml
+++ b/applications/accounting/servicedef/services_payment.xml
@@ -253,16 +253,16 @@ under the License.
 
 
 
-
+
 Add Content To Payment
 
 
 
 
 
-
+
 Update Content To Payment

[ofbiz-framework] 20/28: Improved: Added UI labels for success/error messages for humanres, marketing, order component. (OFBIZ-7696) Thanks Deepak Nigam for reporting and Sourabh Punyani for the patch

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch 
ecomify-OFBIZ-11468_Convert_ShipmentReceiptServices-squashed
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 8a290d3a0e4c3b981cdc33a81d06a6da4c1017b6
Author: Suraj Khurana 
AuthorDate: Sun May 24 13:03:03 2020 +0530

Improved: Added UI labels for success/error messages for humanres, 
marketing, order component.
(OFBIZ-7696)
Thanks Deepak Nigam for reporting and Sourabh Punyani for the patch.
---
 applications/humanres/config/HumanResErrorUiLabels.xml   |  9 +
 applications/humanres/minilang/HumanResEvents.xml|  6 +++---
 applications/marketing/config/MarketingUiLabels.xml  |  9 +
 .../minilang/marketing/contact/ContactListServices.xml   | 12 +---
 applications/order/config/OrderErrorUiLabels.xml |  3 +++
 applications/order/minilang/order/OrderServices.xml  |  2 +-
 6 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/applications/humanres/config/HumanResErrorUiLabels.xml 
b/applications/humanres/config/HumanResErrorUiLabels.xml
index f521936..7829a38 100644
--- a/applications/humanres/config/HumanResErrorUiLabels.xml
+++ b/applications/humanres/config/HumanResErrorUiLabels.xml
@@ -51,4 +51,13 @@
 
 Required Field Missing : Training Class Type 
Id.
 
+
+The Holiday Name is missing.
+
+
+The FromDate is missing
+
+
+This FromDate : ${parameters.estimatedStartDate} 
already exist.
+
 
\ No newline at end of file
diff --git a/applications/humanres/minilang/HumanResEvents.xml 
b/applications/humanres/minilang/HumanResEvents.xml
index 21ae3c9..6d6187e 100644
--- a/applications/humanres/minilang/HumanResEvents.xml
+++ b/applications/humanres/minilang/HumanResEvents.xml
@@ -57,13 +57,13 @@
 
 
 
-
+
 
 
  
 
 
-
+
 
 
 
@@ -82,7 +82,7 @@
 
 
 
-
+
 
 
 
diff --git a/applications/marketing/config/MarketingUiLabels.xml 
b/applications/marketing/config/MarketingUiLabels.xml
index db4c218..937c473 100644
--- a/applications/marketing/config/MarketingUiLabels.xml
+++ b/applications/marketing/config/MarketingUiLabels.xml
@@ -856,6 +856,15 @@
 Der bevorzugte Kontaktmechanismus für Party 
[${partyId}] konnte nicht gefunden werden
 Could not find the preferred contact mechanism 
for party [${parameters.partyId}]
 
+
+Invalid verify code for the 
${contactList.contactListName}
+
+
+The email address (${parameters.email}) does not 
have the Other Email Address as contact purpose
+
+
+Security Error: to run 
sendContactListPartyVerifyEmail you must have the MARKETING_VIEW or 
MARKETING_ADMIN permissions
+
 
 Der bevorzugte Kontaktmechanismus 
[${preferredContactMechType.description}] ist vom falschen Typ für die Liste 
[${listContactMechType.description}].
 The preferred contact mechanism 
[${preferredContactMechType.description}] was not of the right type for the 
list [${listContactMechType.description}].
diff --git 
a/applications/marketing/minilang/marketing/contact/ContactListServices.xml 
b/applications/marketing/minilang/marketing/contact/ContactListServices.xml
index 5dac862..0bb7117 100644
--- a/applications/marketing/minilang/marketing/contact/ContactListServices.xml
+++ b/applications/marketing/minilang/marketing/contact/ContactListServices.xml
@@ -172,7 +172,9 @@ under the License.
 
 
 
-
+
+
+
 
 
 
@@ -226,7 +228,9 @@ under the License.
 
 
 
-
+
+
+
 
 
 
@@ -545,7 +549,9 @@ under the License.
 
 
 
-
+
+
+
 
 
 
diff --git a/applications/order/config/OrderErrorUiLabels.xml 
b/applications/order/config/OrderErrorUiLabels.xml
index d093fef..941e334 100644
--- a/applications/order/config/OrderErrorUiLabels.xml
+++ b/applications/order/config/OrderErrorUiLabels.xml
@@ -4570,6 +4570,9 @@
 服务没有执行
 服務沒有執行
 
+
+The orderItemShipGroupAssoc qualified by 
orderId=${parameters.orderId} orderItemSeqId=${parameters.orderItemSeqId} 
shipGroupSeqId=${parameters.fromGroupIndex} does not exist
+
 
 حدد خطأ العملة : 
 Fehler

[ofbiz-framework] 13/28: Improved: Converted createPaymentAndApplicationForParty service from mini-lang to groovy (OFBIZ-11491) Thanks Devanshu Vyas for reporting and Sourabh Punyani for providing the

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch 
ecomify-OFBIZ-11468_Convert_ShipmentReceiptServices-squashed
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit d5c7151223df334c0d35b06990bfc569d37f693f
Author: Suraj Khurana 
AuthorDate: Sat May 23 15:57:21 2020 +0530

Improved: Converted createPaymentAndApplicationForParty service from 
mini-lang to groovy
(OFBIZ-11491)
Thanks Devanshu Vyas for reporting and Sourabh Punyani for providing the 
patch.
---
 .../groovyScripts/payment/PaymentServices.groovy   | 61 +-
 .../minilang/payment/PaymentServices.xml   | 59 -
 .../accounting/servicedef/services_payment.xml |  4 +-
 3 files changed, 62 insertions(+), 62 deletions(-)

diff --git 
a/applications/accounting/groovyScripts/payment/PaymentServices.groovy 
b/applications/accounting/groovyScripts/payment/PaymentServices.groovy
index 212207d..5e2749b 100644
--- a/applications/accounting/groovyScripts/payment/PaymentServices.groovy
+++ b/applications/accounting/groovyScripts/payment/PaymentServices.groovy
@@ -23,6 +23,7 @@ import org.apache.ofbiz.base.util.UtilProperties
 import org.apache.ofbiz.entity.condition.EntityCondition
 import org.apache.ofbiz.entity.condition.EntityOperator
 import org.apache.ofbiz.entity.GenericValue
+import org.apache.ofbiz.service.ModelService
 import org.apache.ofbiz.service.ServiceUtil
 import java.sql.Timestamp
 
@@ -62,7 +63,65 @@ def createPayment() {
 result.paymentId = paymentId
 return result
 }
-
+def createPaymentAndApplicationForParty() {
+paymentAmount = 0
+List invoiceIds = []
+Map result = success()
+parameters.invoices.each { invoice ->
+if ("INVOICE_READY" == invoice.statusId) {
+Map serviceContext = 
dispatcher.getDispatchContext().makeValidContext('getInvoicePaymentInfoList', 
ModelService.IN_PARAM, invoice)
+serviceContext.userLogin = userLogin
+serviceResult = run service: 'getInvoicePaymentInfoList', with: 
serviceContext
+if (ServiceUtil.isError(serviceResult)) return serviceResult
+invoicePaymentInfo = serviceResult.invoicePaymentInfoList[0]
+paymentAmount += invoicePaymentInfo.outstandingAmount
+} else {
+return error(UtilProperties.getMessage("AccountingUiLabels", 
"AccountingInvoicesRequiredInReadyStatus", parameters.locale))
+}
+}
+if (paymentAmount > 0) {
+serviceResult = run service: 'getPartyAccountingPreferences', with: 
parameters
+if (ServiceUtil.isError(serviceResult)) return serviceResult
+partyAcctgPreference = serviceResult.partyAccountingPreference
+Map createPaymentMap = [:]
+createPaymentMap.paymentTypeId = "VENDOR_PAYMENT"
+createPaymentMap.partyIdFrom = parameters.organizationPartyId
+createPaymentMap.currencyUomId = partyAcctgPreference.baseCurrencyUomId
+createPaymentMap.partyIdTo = parameters.partyId
+createPaymentMap.statusId = "PMNT_SENT"
+createPaymentMap.amount = paymentAmount
+createPaymentMap.paymentMethodTypeId = parameters.paymentMethodTypeId
+createPaymentMap.paymentMethodId = parameters.paymentMethodId
+createPaymentMap.paymentRefNum = parameters.checkStartNumber
+createPaymentMap.userLogin = userLogin
+serviceResult = run service: 'createPayment', with: createPaymentMap
+if (ServiceUtil.isError(serviceResult)) return serviceResult
+paymentId = serviceResult.paymentId
+result.paymentId = paymentId
+
+parameters.invoices.each {invoice ->
+if ("INVOICE_READY" == invoice.statusId) {
+Map serviceContext = 
dispatcher.getDispatchContext().makeValidContext('getInvoicePaymentInfoList', 
ModelService.IN_PARAM, invoice)
+serviceContext.userLogin = userLogin
+serviceResult = run service: 'getInvoicePaymentInfoList', with: 
serviceContext
+if (ServiceUtil.isError(serviceResult)) return serviceResult
+invoicePaymentInfo = serviceResult.invoicePaymentInfoList[0]
+if (invoicePaymentInfo.outstandingAmount > 0) {
+Map createPaymentApplicationMap = [:]
+createPaymentApplicationMap.paymentId =  paymentId
+createPaymentApplicationMap.amountApplied = 
invoicePaymentInfo.outstandingAmount
+createPaymentApplicationMap.invoiceId = invoice.invoiceId
+serviceResult = run service: 'createPaymentApplication', with: 
createPaymentApplicationMap
+if (ServiceUtil.isError(serviceResult)) return serviceResult
+}
+}
+invoiceIds.add(invoice.invoiceId)
+}
+}
+result.invoiceIds = invoiceIds
+result.amount =  paymentAmount
+return result
+}
 def getPaymentRunningTotal(){
 paymentIds = parameters.paymentIds;

[ofbiz-framework] 28/28: Improved: removes useless "@deprecated No replacement" comments in Java code

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch 
ecomify-OFBIZ-11468_Convert_ShipmentReceiptServices-squashed
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 2ff819043d5c0c21532aad4bef8324f766e8f96b
Author: Jacques Le Roux 
AuthorDate: Wed May 27 09:26:43 2020 +0200

Improved: removes useless "@deprecated No replacement" comments in Java code

This follows a discussion on dev ML 5 days ago.
Those comments are useless because they are all related to Minilang and 
Minilang
is deprecated as a whole.
---
 .../org/apache/ofbiz/minilang/method/MethodOperation.java|  4 +---
 .../src/main/java/org/apache/ofbiz/security/Security.java| 12 
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git 
a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodOperation.java
 
b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodOperation.java
index d92ddea..8c27a38 100644
--- 
a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodOperation.java
+++ 
b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/MethodOperation.java
@@ -47,9 +47,7 @@ public abstract class MethodOperation extends MiniLangElement 
{
  * @throws MiniLangException */
 public abstract boolean exec(MethodContext methodContext) throws 
MiniLangException;
 
-/** Create a string representation of the operation, using the current 
context.
- * @deprecated No replacement.
- */
+/** Create a string representation of the operation, using the current 
context.*/
 @Deprecated
 public String expandedString(MethodContext methodContext) {
 return FlexibleStringExpander.expandString(toString(), 
methodContext.getEnvMap());
diff --git 
a/framework/security/src/main/java/org/apache/ofbiz/security/Security.java 
b/framework/security/src/main/java/org/apache/ofbiz/security/Security.java
index f005729..507be35 100644
--- a/framework/security/src/main/java/org/apache/ofbiz/security/Security.java
+++ b/framework/security/src/main/java/org/apache/ofbiz/security/Security.java
@@ -36,17 +36,9 @@ import org.apache.ofbiz.entity.GenericValue;
  */
 public interface Security {
 
-/**
- *
- * @deprecated No replacement.
- */
 @Deprecated
 public Delegator getDelegator();
 
-/**
-*
-* @deprecated No replacement.
-*/
 @Deprecated
 public void setDelegator(Delegator delegator);
 
@@ -56,8 +48,6 @@ public interface Security {
  * @param userLoginId The userLoginId to find security groups by
  * @return An iterator made from the Collection either cached or retrieved 
from the database through the
  *UserLoginSecurityGroup Delegator.
- *
- * @deprecated No replacement.
  */
 @Deprecated
 public Iterator 
findUserLoginSecurityGroupByUserLoginId(String userLoginId);
@@ -70,8 +60,6 @@ public interface Security {
  * @param groupId The ID of the group
  * @param permission The name of the permission
  * @return boolean specifying whether or not a SecurityGroupPermission row 
exists
- *
- * @deprecated No replacement.
  */
 @Deprecated
 public boolean securityGroupPermissionExists(String groupId, String 
permission);

[ofbiz-framework] 04/28: Fixed: showjGrowl called twice (OFBIZ-11720)

2020-05-31 Thread jleroux 
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch 
ecomify-OFBIZ-11468_Convert_ShipmentReceiptServices-squashed
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 2621fd4ef48f2255a337f3e2dc858e7f4521f755
Author: James Yong 
AuthorDate: Thu May 21 21:38:08 2020 +0800

Fixed: showjGrowl called twice (OFBIZ-11720)

showjGrowl function is called twice,
even when there is no message to show.
---
 themes/common-theme/template/includes/Messages.ftl | 42 +-
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/themes/common-theme/template/includes/Messages.ftl 
b/themes/common-theme/template/includes/Messages.ftl
index 78f82ab..78996db 100644
--- a/themes/common-theme/template/includes/Messages.ftl
+++ b/themes/common-theme/template/includes/Messages.ftl
@@ -57,17 +57,10 @@ under the License.
   
 
   
-  <#assign jGrowlPosition = modelTheme.getProperty("jgrowlPosition")>
-  <#assign jGrowlWidth = modelTheme.getProperty("jgrowlWidth")>
-  <#assign jGrowlHeight = modelTheme.getProperty("jgrowlHeight")>
-  <#assign jGrowlSpeed = modelTheme.getProperty("jgrowlSpeed")>
 
-  showjGrowl(
-  "${uiLabelMap.CommonShowAll}", "${uiLabelMap.CommonCollapse}", 
"${uiLabelMap.CommonHideAllNotifications}",
-  "${jGrowlPosition}", "${jGrowlWidth}", "${jGrowlHeight}", 
"${jGrowlSpeed}");
   <#-- display the event messages -->
   <#if (eventMessage?has_content || eventMessageList?has_content)>
-  
 <#noescape>${uiLabelMap.CommonFollowingOccurred}:
 <#if eventMessage?has_content>
@@ -78,24 +71,17 @@ under the License.
 ${StringUtil.wrapString(eventMsg)}
   
 
-  
-  <#assign jGrowlPosition = modelTheme.getProperty("jgrowlPosition")>
-  <#assign jGrowlWidth = modelTheme.getProperty("jgrowlWidth")>
-  <#assign jGrowlHeight = modelTheme.getProperty("jgrowlHeight")>
-  <#assign jGrowlSpeed = modelTheme.getProperty("jgrowlSpeed")>
-  showjGrowl(
-  "${uiLabelMap.CommonShowAll}", "${uiLabelMap.CommonCollapse}", 
"${uiLabelMap.CommonHideAllNotifications}",
-  "${jGrowlPosition}", "${jGrowlWidth}", "${jGrowlHeight}", 
"${jGrowlSpeed}");
+
   
 
-   <#-- display the warning messages -->
+  <#-- display the warning messages -->
   <#if (warningMessage?has_content || warningMessageList?has_content)>
 
-  
<#noescape>${uiLabelMap.CommonFollowingErrorsOccurred}:
-  <#if warningMessage?has_content>
-${StringUtil.wrapString(warningMessage)}
-  
+<#noescape>${uiLabelMap.CommonFollowingErrorsOccurred}:
+<#if warningMessage?has_content>
+  ${StringUtil.wrapString(warningMessage)}
+
   <#if warningMessageList?has_content>
 <#list warningMessageList as warningMsg>
   ${StringUtil.wrapString(warningMsg)}
@@ -103,12 +89,16 @@ under the License.
   
 
   
-  <#assign jGrowlPosition = modelTheme.getProperty("jgrowlPosition")>
-  <#assign jGrowlWidth = modelTheme.getProperty("jgrowlWidth")>
-  <#assign jGrowlHeight = modelTheme.getProperty("jgrowlHeight")>
-  <#assign jGrowlSpeed = modelTheme.getProperty("jgrowlSpeed")>
 
-  showjGrowl(
+  <#if (errorMessage?has_content || errorMessageList?has_content
+ || eventMessage?has_content || eventMessageList?has_content
+ || warningMessage?has_content || warningMessageList?has_content)>
+<#assign jGrowlPosition = modelTheme.getProperty("jgrowlPosition")>
+<#assign jGrowlWidth = modelTheme.getProperty("jgrowlWidth")>
+<#assign jGrowlHeight = modelTheme.getProperty("jgrowlHeight")>
+<#assign jGrowlSpeed = modelTheme.getProperty("jgrowlSpeed")>
+