You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by bi...@apache.org on 2009/11/03 21:52:01 UTC
svn commit: r832551 - in /ofbiz/trunk/framework/widget:
src/org/ofbiz/widget/form/MacroFormRenderer.java
templates/htmlFormMacroLibrary.ftl
Author: bibryam
Date: Tue Nov 3 20:52:01 2009
New Revision: 832551
URL: http://svn.apache.org/viewvc?rev=832551&view=rev
Log:
Enabled on-field-event-update-area on lookup elements which was already available in HtmlFormRenderer.
This can be seen in Add example feature application form.
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=832551&r1=832550&r2=832551&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Tue Nov 3 20:52:01 2009
@@ -1853,11 +1853,7 @@
}
String size = Integer.toString(lookupField.getSize());
Integer maxlength = lookupField.getMaxlength();
-
String id = modelFormField.getIdName();
- if (id == null) {
- id = "";
- }
List<ModelForm.UpdateArea> updateAreas = modelFormField.getOnChangeUpdateAreas();
boolean ajaxEnabled = updateAreas != null && this.javaScriptEnabled;
@@ -1905,6 +1901,8 @@
sr.append(size);
sr.append("\" maxlength=\"");
sr.append((maxlength != null? Integer.toString(maxlength): ""));
+ sr.append("\" id=\"");
+ sr.append(id);
sr.append("\" autocomplete=\"");
sr.append(autocomplete);
sr.append("\" descriptionFieldName=\"");
@@ -1917,9 +1915,13 @@
sr.append(targetParameterIter.toString());
sr.append(" imgSrc=\"");
sr.append(imgSrc.toString());
- sr.append("\" />");
+ sr.append("\" ajaxUrl=\"");
+ sr.append(ajaxUrl);
+ sr.append("\" ajaxEnabled=");
+ sr.append(Boolean.toString(ajaxEnabled));
+ sr.append(" />");
executeMacro(sr.toString());
-
+
this.addAsterisks(writer, context, modelFormField);
this.makeHyperlinkString(writer, lookupField.getSubHyperlink(), context);
Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=832551&r1=832550&r2=832551&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Tue Nov 3 20:52:01 2009
@@ -407,8 +407,8 @@
</#if>
</#macro>
-<#macro renderLookupField className alert name value size maxlength autocomplete descriptionFieldName formName lookupFieldFormName targetParameterIter imgSrc>
-<input type="text" <@renderClass className alert /><#if name?has_content> name="${name}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/>
+<#macro renderLookupField className alert name value size maxlength id autocomplete descriptionFieldName formName lookupFieldFormName targetParameterIter imgSrc ajaxUrl ajaxEnabled>
+<input type="text" <@renderClass className alert /><#if name?has_content> name="${name}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if id?has_content> id="${id}"</#if><#rt/><#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/>
<#if descriptionFieldName?has_content>
<a href="javascript:call_fieldlookup3(document.${formName?html}.${name?html},'${descriptionFieldName}',<#rt/>
<#else>
@@ -421,6 +421,9 @@
</#if>
);"><#rt>
<img src="${imgSrc}"width="15" height="14" border="0" alt="Lookup"/></a><#rt>
+<#if ajaxEnabled?has_content && ajaxEnabled>
+ <script language="JavaScript" type="text/javascript">ajaxAutoCompleter('${ajaxUrl}');</script><#t/>
+</#if>
</#macro>
<#macro renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl paginateFirstLabel paginatePreviousStyle ajaxPreviousUrl previousUrl paginatePreviousLabel pageLabel ajaxSelectUrl selectUrl ajaxSelectSizeUrl selectSizeUrl commonDisplaying paginateNextStyle ajaxNextUrl nextUrl paginateNextLabel paginateLastStyle ajaxLastUrl lastUrl paginateLastLabel paginateViewSizeLabel>
<#if listSize gt 20>
Re: svn commit: r832551 - in /ofbiz/trunk/framework/widget: src/org/ofbiz/widget/form/MacroFormRenderer.java
templates/htmlFormMacroLibrary.ftl
Posted by Bilgin Ibryam <bi...@gmail.com>.
Mridul Pathak wrote:
> Hi Bilgin,
>
> <renderLookupField> and <renderNextPrev> macros in
> foFormMacroLibrary.ftl and xmlFormMacroLibrary.ftl needs to be updated too
> with the new arguments introduced here in htmlFormMacroLibrary.ftl. I have
> attached the patch for the same on
> https://issues.apache.org/jira/browse/OFBIZ-3147. Please have a look at it.
>
>
Thanks Mridul. I will check that.
Re: svn commit: r832551 - in /ofbiz/trunk/framework/widget:
src/org/ofbiz/widget/form/MacroFormRenderer.java templates/htmlFormMacroLibrary.ftl
Posted by Mridul Pathak <mr...@hotwaxmedia.com>.
Hi Bilgin,
<renderLookupField> and <renderNextPrev> macros in
foFormMacroLibrary.ftl and xmlFormMacroLibrary.ftl needs to be updated too
with the new arguments introduced here in htmlFormMacroLibrary.ftl. I have
attached the patch for the same on
https://issues.apache.org/jira/browse/OFBIZ-3147. Please have a look at it.
--
Thanks & Regards
Mridul Pathak
On Wed, Nov 4, 2009 at 2:22 AM, <bi...@apache.org> wrote:
> Author: bibryam
> Date: Tue Nov 3 20:52:01 2009
> New Revision: 832551
>
> URL: http://svn.apache.org/viewvc?rev=832551&view=rev
> Log:
> Enabled on-field-event-update-area on lookup elements which was already
> available in HtmlFormRenderer.
> This can be seen in Add example feature application form.
>
> Modified:
>
> ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
> ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
>
> Modified:
> ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=832551&r1=832550&r2=832551&view=diff
>
> ==============================================================================
> ---
> ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
> (original)
> +++
> ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
> Tue Nov 3 20:52:01 2009
> @@ -1853,11 +1853,7 @@
> }
> String size = Integer.toString(lookupField.getSize());
> Integer maxlength = lookupField.getMaxlength();
> -
> String id = modelFormField.getIdName();
> - if (id == null) {
> - id = "";
> - }
>
> List<ModelForm.UpdateArea> updateAreas =
> modelFormField.getOnChangeUpdateAreas();
> boolean ajaxEnabled = updateAreas != null &&
> this.javaScriptEnabled;
> @@ -1905,6 +1901,8 @@
> sr.append(size);
> sr.append("\" maxlength=\"");
> sr.append((maxlength != null? Integer.toString(maxlength): ""));
> + sr.append("\" id=\"");
> + sr.append(id);
> sr.append("\" autocomplete=\"");
> sr.append(autocomplete);
> sr.append("\" descriptionFieldName=\"");
> @@ -1917,9 +1915,13 @@
> sr.append(targetParameterIter.toString());
> sr.append(" imgSrc=\"");
> sr.append(imgSrc.toString());
> - sr.append("\" />");
> + sr.append("\" ajaxUrl=\"");
> + sr.append(ajaxUrl);
> + sr.append("\" ajaxEnabled=");
> + sr.append(Boolean.toString(ajaxEnabled));
> + sr.append(" />");
> executeMacro(sr.toString());
> -
> +
> this.addAsterisks(writer, context, modelFormField);
>
> this.makeHyperlinkString(writer, lookupField.getSubHyperlink(),
> context);
>
> Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=832551&r1=832550&r2=832551&view=diff
>
> ==============================================================================
> --- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
> (original)
> +++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Tue Nov
> 3 20:52:01 2009
> @@ -407,8 +407,8 @@
> </#if>
> </#macro>
>
> -<#macro renderLookupField className alert name value size maxlength
> autocomplete descriptionFieldName formName lookupFieldFormName
> targetParameterIter imgSrc>
> -<input type="text" <@renderClass className alert /><#if name?has_content>
> name="${name}"</#if><#if value?has_content> value="${value}"</#if><#if
> size?has_content> size="${size}"</#if><#if maxlength?has_content>
> maxlength="${maxlength}"</#if><#if autocomplete?has_content>
> autocomplete="off"</#if>/><#rt/>
> +<#macro renderLookupField className alert name value size maxlength id
> autocomplete descriptionFieldName formName lookupFieldFormName
> targetParameterIter imgSrc ajaxUrl ajaxEnabled>
> +<input type="text" <@renderClass className alert /><#if name?has_content>
> name="${name}"</#if><#if value?has_content> value="${value}"</#if><#if
> size?has_content> size="${size}"</#if><#if maxlength?has_content>
> maxlength="${maxlength}"</#if><#if id?has_content>
> id="${id}"</#if><#rt/><#if autocomplete?has_content>
> autocomplete="off"</#if>/><#rt/>
> <#if descriptionFieldName?has_content>
> <a
> href="javascript:call_fieldlookup3(document.${formName?html}.${name?html},'${descriptionFieldName}',<#rt/>
> <#else>
> @@ -421,6 +421,9 @@
> </#if>
> );"><#rt>
> <img src="${imgSrc}"width="15" height="14" border="0"
> alt="Lookup"/></a><#rt>
> +<#if ajaxEnabled?has_content && ajaxEnabled>
> + <script language="JavaScript"
> type="text/javascript">ajaxAutoCompleter('${ajaxUrl}');</script><#t/>
> +</#if>
> </#macro>
> <#macro renderNextPrev paginateStyle paginateFirstStyle viewIndex
> highIndex listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl
> firstUrl paginateFirstLabel paginatePreviousStyle ajaxPreviousUrl
> previousUrl paginatePreviousLabel pageLabel ajaxSelectUrl selectUrl
> ajaxSelectSizeUrl selectSizeUrl commonDisplaying paginateNextStyle
> ajaxNextUrl nextUrl paginateNextLabel paginateLastStyle ajaxLastUrl lastUrl
> paginateLastLabel paginateViewSizeLabel>
> <#if listSize gt 20>
>
>
>