Re: svn commit: r1635383 [1/6] - in /ofbiz/trunk: applications/order/src/org/ofbiz/order/order/ applications/order/src/org/ofbiz/order/quote/ applications/order/src/org/ofbiz/order/requirement/ applications/order/src/org/ofbiz/order/shoppingcart/ applicati...

[Scott Gray-2]

I just realized this commit unintentionally contained an unrelated change that includes the EntityQuery class as a shared freemarker variable.  It needed to go in, but should have been a separate commit.  My apologies.

Regards
Scott

On 30/10/2014, at 5:18 pm, [hidden email] wrote:

> Author: lektran
> Date: Thu Oct 30 04:18:05 2014
> New Revision: 1635383
>
> URL: http://svn.apache.org/r1635383
> Log:
> Regex search/replace for delegator.findOne() to  EntityQuery.queryOne()
>
> Apologies for the large commit.
>

...

> Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java?rev=1635383&r1=1635382&r2=1635383&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java (original)
> +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java Thu Oct 30 04:18:05 2014
> @@ -65,6 +65,7 @@ import freemarker.template.SimpleScalar;
> import freemarker.template.Template;
> import freemarker.template.TemplateException;
> import freemarker.template.TemplateExceptionHandler;
> +import freemarker.template.TemplateHashModel;
> import freemarker.template.TemplateModel;
> import freemarker.template.TemplateModelException;
> import freemarker.template.Version;
> @@ -91,7 +92,13 @@ public class FreeMarkerWorker {
>         Configuration newConfig = new Configuration(version);
>
>         newConfig.setObjectWrapper(wrapper);
> -        newConfig.setSharedVariable("Static", wrapper.getStaticModels());
> +        TemplateHashModel staticModels = wrapper.getStaticModels();
> +        newConfig.setSharedVariable("Static", staticModels);
> +        try {
> +            newConfig.setSharedVariable("EntityQuery", staticModels.get("org.ofbiz.entity.util.EntityQuery"));
> +        } catch (TemplateModelException e) {
> +            Debug.logError(e, module);
> +        }
>         newConfig.setLocalizedLookup(false);
>         newConfig.setSharedVariable("StringUtil", new BeanModel(StringUtil.INSTANCE, wrapper));
>         newConfig.setTemplateLoader(new FlexibleTemplateLoader());