Re: svn commit: r1806821 - /ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbi z/widget/renderer/macro/MacroFormRenderer.java

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1806821 - /ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbi z/widget/renderer/macro/MacroFormRenderer.java

Jacques Le Roux
Administrator
Thanks Nicolas,

Seems to work well (tested on example/control/FormWidgetExamples)

Jacques


Le 31/08/2017 à 18:19, [hidden email] a écrit :

> Author: nmalin
> Date: Thu Aug 31 16:19:29 2017
> New Revision: 1806821
>
> URL: http://svn.apache.org/viewvc?rev=1806821&view=rev
> Log:
> Fixed: Missing to convert a showDescription from widget.properties to modelTheme on the macroFormRendere.java to prepare the lookup macro (OFBIZ-9138 Create a common theme)
>
> Modified:
>      ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
>
> Modified: ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java
> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java?rev=1806821&r1=1806820&r2=1806821&view=diff
> ==============================================================================
> --- ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java (original)
> +++ ofbiz/ofbiz-framework/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java Thu Aug 31 16:19:29 2017
> @@ -2199,7 +2199,7 @@ public final class MacroFormRenderer imp
>           }
>           Boolean showDescription = lookupField.getShowDescription();
>           if (showDescription == null) {
> -            showDescription = "Y".equals(UtilProperties.getPropertyValue("widget", "widget.lookup.showDescription", "Y"));
> +            showDescription = "Y".equals(visualTheme.getModelTheme().getLookupShowDescription());
>           }
>           // lastViewName, used by lookup to remember the real last view name
>           String lastViewName = request.getParameter("_LAST_VIEW_NAME_"); // Try to get it from parameters firstly
> @@ -3074,7 +3074,6 @@ public final class MacroFormRenderer imp
>           // get the parameterized pagination index and size fields
>           int paginatorNumber = WidgetWorker.getPaginatorNumber(context);
>           ModelForm modelForm = modelFormField.getModelForm();
> -        VisualTheme visualTheme = UtilHttp.getVisualTheme(request);
>           ModelTheme modelTheme = visualTheme.getModelTheme();
>           String viewIndexField = modelForm.getMultiPaginateIndexField(context);
>           String viewSizeField = modelForm.getMultiPaginateSizeField(context);
>
>
>