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/12/01 12:04:50 UTC
svn commit: r885732 - in
/ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget:
form/MacroFormRenderer.java form/ModelForm.java html/HtmlFormRenderer.java
html/HtmlScreenRenderer.java screen/MacroScreenRenderer.java
Author: bibryam
Date: Tue Dec 1 11:04:49 2009
New Revision: 885732
URL: http://svn.apache.org/viewvc?rev=885732&view=rev
Log:
Applied fix from trunk for revision: 885724
Applied patch from https://issues.apache.org/jira/browse/OFBIZ-3254 - Setting viewSize and viewIndex in screen context for List Forms do not work.
Thanks to Mridul Pathak for the contribution.
Modified:
ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java
ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
Modified: ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=885732&r1=885731&r2=885732&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original)
+++ ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Tue Dec 1 11:04:49 2009
@@ -1936,8 +1936,8 @@
// get the parameterized pagination index and size fields
int paginatorNumber = modelForm.getPaginatorNumber(context);
- String viewIndexParam = modelForm.getPaginateIndexField(context);
- String viewSizeParam = modelForm.getPaginateSizeField(context);
+ String viewIndexParam = modelForm.getMultiPaginateIndexField(context);
+ String viewSizeParam = modelForm.getMultiPaginateSizeField(context);
int viewIndex = modelForm.getViewIndex(context);
int viewSize = modelForm.getViewSize(context);
Modified: ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/form/ModelForm.java?rev=885732&r1=885731&r2=885732&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/form/ModelForm.java (original)
+++ ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/form/ModelForm.java Tue Dec 1 11:04:49 2009
@@ -2204,28 +2204,42 @@
if (UtilValidate.isEmpty(field)) {
field = DEFAULT_PAG_INDEX_FIELD;
}
- // append the paginator number
- field = field + "_" + getPaginatorNumber(context);
return field;
}
+ public String getMultiPaginateIndexField(Map<String, Object> context) {
+ String field = this.paginateIndexField.expandString(context);
+ if (UtilValidate.isEmpty(field)) {
+ field = DEFAULT_PAG_INDEX_FIELD;
+ }
+
+ // append the paginator number
+ field = field + "_" + getPaginatorNumber(context);
+ return field;
+ }
public int getPaginateIndex(Map<String, Object> context) {
- String field = this.getPaginateIndexField(context);
+ String field = this.getMultiPaginateIndexField(context);
int viewIndex = 0;
try {
Object value = context.get(field);
if (value == null) {
- // try parameters.VIEW_INDEX as that is an old OFBiz convention
- Map parameters = (Map) context.get("parameters");
- if (parameters != null) {
- value = parameters.get("VIEW_INDEX" + "_" + getPaginatorNumber(context));
-
- if (value == null) {
- value = parameters.get(field);
+ // try parameters.VIEW_INDEX as that is an old OFBiz convention
+ Map parameters = (Map) context.get("parameters");
+ if (parameters != null) {
+ value = parameters.get("VIEW_INDEX" + "_" + getPaginatorNumber(context));
+
+ if (value == null) {
+ value = parameters.get(field);
+ }
}
}
+
+ // try paginate index field without paginator number
+ if (value == null) {
+ field = this.getPaginateIndexField(context);
+ value = context.get(field);
}
if (value instanceof Integer) {
@@ -2245,13 +2259,21 @@
if (UtilValidate.isEmpty(field)) {
field = DEFAULT_PAG_SIZE_FIELD;
}
+ return field;
+ }
+
+ public String getMultiPaginateSizeField(Map<String, Object> context) {
+ String field = this.paginateSizeField.expandString(context);
+ if (UtilValidate.isEmpty(field)) {
+ field = DEFAULT_PAG_SIZE_FIELD;
+ }
// append the paginator number
field = field + "_" + getPaginatorNumber(context);
return field;
}
public int getPaginateSize(Map<String, Object> context) {
- String field = this.getPaginateSizeField(context);
+ String field = this.getMultiPaginateSizeField(context);
int viewSize = this.defaultViewSize;
try {
@@ -2268,6 +2290,12 @@
}
}
}
+
+ // try the page size field without paginator number
+ if (value == null) {
+ field = this.getPaginateSizeField(context);
+ value = context.get(field);
+ }
if (value instanceof Integer) {
viewSize = ((Integer) value).intValue();
Modified: ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java?rev=885732&r1=885731&r2=885732&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java (original)
+++ ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java Tue Dec 1 11:04:49 2009
@@ -2287,8 +2287,8 @@
// get the parameterized pagination index and size fields
int paginatorNumber = modelForm.getPaginatorNumber(context);
- String viewIndexParam = modelForm.getPaginateIndexField(context);
- String viewSizeParam = modelForm.getPaginateSizeField(context);
+ String viewIndexParam = modelForm.getMultiPaginateIndexField(context);
+ String viewSizeParam = modelForm.getMultiPaginateSizeField(context);
int viewIndex = modelForm.getViewIndex(context);
int viewSize = modelForm.getViewSize(context);
Modified: ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java?rev=885732&r1=885731&r2=885732&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java (original)
+++ ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java Tue Dec 1 11:04:49 2009
@@ -262,8 +262,8 @@
// get the parametrized pagination index and size fields
int paginatorNumber = modelForm.getPaginatorNumber(context);
- String viewIndexParam = modelForm.getPaginateIndexField(context);
- String viewSizeParam = modelForm.getPaginateSizeField(context);
+ String viewIndexParam = modelForm.getMultiPaginateIndexField(context);
+ String viewSizeParam = modelForm.getMultiPaginateSizeField(context);
int viewIndex = modelForm.getViewIndex(context);
int viewSize = modelForm.getViewSize(context);
Modified: ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java?rev=885732&r1=885731&r2=885732&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java (original)
+++ ofbiz/branches/release09.04/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java Tue Dec 1 11:04:49 2009
@@ -721,8 +721,8 @@
// get the parametrized pagination index and size fields
int paginatorNumber = modelForm.getPaginatorNumber(context);
- String viewIndexParam = modelForm.getPaginateIndexField(context);
- String viewSizeParam = modelForm.getPaginateSizeField(context);
+ String viewIndexParam = modelForm.getMultiPaginateIndexField(context);
+ String viewSizeParam = modelForm.getMultiPaginateSizeField(context);
int viewIndex = modelForm.getViewIndex(context);
int viewSize = modelForm.getViewSize(context);