Author: adrianc
Date: Tue May 20 10:12:35 2008
New Revision: 658351
URL:
http://svn.apache.org/viewvc?rev=658351&view=revLog:
Small fixups for last commit.
Modified:
ofbiz/trunk/framework/example/widget/example/ExampleForms.xml
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
Modified: ofbiz/trunk/framework/example/widget/example/ExampleForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/ExampleForms.xml?rev=658351&r1=658350&r2=658351&view=diff==============================================================================
--- ofbiz/trunk/framework/example/widget/example/ExampleForms.xml (original)
+++ ofbiz/trunk/framework/example/widget/example/ExampleForms.xml Tue May 20 10:12:35 2008
@@ -36,7 +36,7 @@
<!-- Typically, this extended form wouldn't be necessary. The parent form (ListExamples) would
have these attributes. -->
- <form name="ListExamplesAjax" extends="ListExamples" type="list" paginate-target="authview/findExampleAjax" view-size="3">
+ <form name="ListExamplesAjax" extends="ListExamples" type="list" paginate-target="authview/findExampleAjax">
<on-event-update-area event-type="paginate" area-id="ListExamplesAjax" area-target="ListExampleFormOnly"/>
</form>
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java?rev=658351&r1=658350&r2=658351&view=diff==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java Tue May 20 10:12:35 2008
@@ -2023,13 +2023,11 @@
boolean javaScriptEnabled = UtilHttp.isJavaScriptEnabled(request);
boolean ajaxEnabled = false;
List<ModelForm.UpdateArea> updateAreas = modelForm.getOnPaginateUpdateAreas();
- String targetService = null;
+ String targetService = modelForm.getPaginateTarget(context);
if (javaScriptEnabled) {
if (UtilValidate.isNotEmpty(updateAreas)) {
ajaxEnabled = true;
}
- } else {
- targetService = modelForm.getPaginateTarget(context);
}
if (targetService == null) {
targetService = "${targetService}";