ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zhang...@apache.org
Subject svn commit: r1717710 - /ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelForm.java
Date Thu, 03 Dec 2015 04:46:58 GMT
Author: zhangwei
Date: Thu Dec  3 04:46:57 2015
New Revision: 1717710

URL: http://svn.apache.org/viewvc?rev=1717710&view=rev
Log:
OFBIZ-6736 The attribute paginate-style of form widget dose not work

Modified:
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelForm.java

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelForm.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelForm.java?rev=1717710&r1=1717709&r2=1717710&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelForm.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelForm.java Thu Dec  3 04:46:57
2015
@@ -575,10 +575,14 @@ public abstract class ModelForm extends
         }
         this.paginateViewSizeLabel = paginateViewSizeLabel;
         String paginateStyle = formElement.getAttribute("paginate-style");
-        if (paginateStyle.isEmpty() && parentModel != null) {
-            this.paginateStyle = parentModel.paginateStyle;
+        if (paginateStyle.isEmpty()) {
+            if(parentModel != null) {
+                this.paginateStyle = parentModel.paginateStyle;
+            } else {
+                this.paginateStyle = DEFAULT_PAG_STYLE;
+            }
         } else {
-            this.paginateStyle = DEFAULT_PAG_STYLE;
+            this.paginateStyle = paginateStyle;
         }
         FlexibleStringExpander paginate = FlexibleStringExpander.getInstance(formElement.getAttribute("paginate"));
         if (paginate.isEmpty() && parentModel != null) {



Mime
View raw message