You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Jacques Le Roux <ja...@les7arts.com> on 2010/09/10 14:32:56 UTC

Re: svn commit: r995711 - /ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl

I checked, the macro renderDateTimeField  was not an issue in trunk as it was not used in any ftl templates and was corretly handled 
in MacroFormRenderer.renderDateTimeField().
Also the other types (fo, csv, txt, xml) were not used anywhere, so no worries there too.
Now if someone try to add a renderDateTimeField  in a ftl template in trunk s/he will stumble upon the issue and will have to handle 
it there, so no worries there too.
When we will merge back the jQuery branch it should merge smoothly, so no worries there too.

To keep things consistent and while at it I have also handled the action/event couple in HtmlFormRenderer.java.renderDateTimeField() 
at r995771 in trunk

Jacques

> Author: jleroux
> Date: Fri Sep 10 09:22:31 2010
> New Revision: 995711
>
> URL: http://svn.apache.org/viewvc?rev=995711&view=rev
> Log:
> Fix a bug introduced by r966202 and merged at r987348.
> The bug appears when in Webtools/Data maintenance you want to edit an entity: it's on Stamp fields. It's not reproducible in 
> trunk, because there the renderDateTimeField macro is not used
>
> Modified:
>    ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl
>
> Modified: ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl
> URL: 
> http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=995711&r1=995710&r2=995711&view=diff
> ==============================================================================
> --- ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
> +++ ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl Fri Sep 10 09:22:31 2010
> @@ -81,7 +81,7 @@ under the License.
>     </#if>
> </#macro>
>
> -<#macro renderDateTimeField name className alert title value size maxlength id event action dateType shortDateInput 
> timeDropdownParamName defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName 
> minutes isTwelveHour ampmName amSelected pmSelected compositeType formName>
> +<#macro renderDateTimeField name className alert title value size maxlength id dateType shortDateInput timeDropdownParamName 
> defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes isTwelveHour 
> ampmName amSelected pmSelected compositeType formName event="" action="">
>   <span class="view-calendar">
>       <input type="text" name="${name}" <#if event?has_content && action?has_content> ${event}="${action}"</#if> <@renderClass 
> className alert /><#rt/>
>         <#if title?has_content> title="${title}"</#if>
>
>