You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by James Yong <ja...@apache.org> on 2020/05/14 16:16:15 UTC
Re: [ofbiz-framework] branch trunk updated: Improved: <script-template> widget tag (OFBIZ-11686)
Hi Jacques,
Will do.
Thanks,
James
On 2020/05/14 11:20:55, Jacques Le Roux <ja...@les7arts.com> wrote:
> Thanks Olivier,
>
> It works:
>
> https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1354
> https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1354/steps/shell_3/logs/stdio
>
> But I guess James introduced styles issues:
>
> https://ci.apache.org/builders/ofbizTrunkFrameworkPlugins/builds/1354/steps/shell_2/logs/stdio
>
> That's a regression from 37088 to 37134
>
> Please James have a look, TIA
>
> Jacques
>
> Le 14/05/2020 à 12:17, holivier@apache.org a écrit :
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > holivier 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 4f5e6f9 Improved: <script-template> widget tag (OFBIZ-11686)
> > 4f5e6f9 is described below
> >
> > commit 4f5e6f9f06095b406128f6cdfce38b325a31668c
> > Author: holivier <ho...@apache.org>
> > AuthorDate: Thu May 14 09:38:23 2020 +0200
> >
> > Improved: <script-template> widget tag
> > (OFBIZ-11686)
> >
> > Correction in javadoc, <script is not authorize in javadoc because it
> > can introduce some javascript in javadoc, and so generate an error in
> > javadoc build.
> > Replace <script-template/> by "script-template"
> > ---
> > .../java/org/apache/ofbiz/webapp/ftl/ScriptTemplateListTransform.java | 2 +-
> > .../src/main/java/org/apache/ofbiz/widget/model/ScriptTemplateUtil.java | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/ScriptTemplateListTransform.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/ScriptTemplateListTransform.java
> > index c749c87..6b3f385 100644
> > --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/ScriptTemplateListTransform.java
> > +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/ftl/ScriptTemplateListTransform.java
> > @@ -33,7 +33,7 @@ import freemarker.template.TemplateModelException;
> > import freemarker.template.TemplateTransformModel;
> >
> > /**
> > - * Render the script tags collected from the <script-template/>
> > + * Render the script tags collected from the "script-template" tag
> > */
> > public class ScriptTemplateListTransform implements TemplateTransformModel {
> >
> > diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ScriptTemplateUtil.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ScriptTemplateUtil.java
> > index d6d16a2..9d3417c 100644
> > --- a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ScriptTemplateUtil.java
> > +++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ScriptTemplateUtil.java
> > @@ -52,7 +52,7 @@ public class ScriptTemplateUtil {
> > }
> >
> > /**
> > - * get the script src links collected from the <script-template/> tags
> > + * get the script src links collected from the "script-template" tags
> > * @param request
> > * @return
> > */
> >
>