You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by nm...@apache.org on 2015/05/29 15:40:35 UTC
svn commit: r1682463 - in
/ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget:
model/ModelFormField.java renderer/macro/MacroFormRenderer.java
Author: nmalin
Date: Fri May 29 13:40:34 2015
New Revision: 1682463
URL: http://svn.apache.org/r1682463
Log:
Apply patch from OFBIZ-6417 renderDateFindField doesn't reselect operation by Christian Carlow
Modified:
ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/model/ModelFormField.java
ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java
Modified: ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/model/ModelFormField.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/model/ModelFormField.java?rev=1682463&r1=1682462&r2=1682463&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/model/ModelFormField.java (original)
+++ ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/model/ModelFormField.java Fri May 29 13:40:34 2015
@@ -1030,10 +1030,36 @@ public class ModelFormField {
return this.defaultOptionFrom;
}
+ public String getDefaultOptionFrom(Map<String, Object> context) {
+ String defaultOption = getDefaultOptionFrom();
+
+ Map<String, Object> parameters = UtilGenerics.checkMap(context.get("parameters"), String.class, Object.class);
+ if (UtilValidate.isNotEmpty(parameters)) {
+ String fieldName = this.getModelFormField().getName();
+ if (parameters.containsKey(fieldName.concat("_fld0_value"))){
+ defaultOption = (String)parameters.get(fieldName.concat("_fld0_op"));
+ }
+ }
+ return defaultOption;
+ }
+
public String getDefaultOptionThru() {
return this.defaultOptionThru;
}
+ public String getDefaultOptionThru(Map<String, Object> context) {
+ String defaultOption = getDefaultOptionThru();
+
+ Map<String, Object> parameters = UtilGenerics.checkMap(context.get("parameters"), String.class, Object.class);
+ if (UtilValidate.isNotEmpty(parameters)) {
+ String fieldName = this.getModelFormField().getName();
+ if( parameters.containsKey(fieldName.concat("_fld1_value"))) {
+ defaultOption = (String)parameters.get(fieldName.concat("_fld1_op"));
+ }
+ }
+ return defaultOption;
+ }
+
@Override
public void renderFieldString(Appendable writer, Map<String, Object> context, FormStringRenderer formStringRenderer)
throws IOException {
Modified: ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java?rev=1682463&r1=1682462&r2=1682463&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java (original)
+++ ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java Fri May 29 13:40:34 2015
@@ -1938,8 +1938,8 @@ public final class MacroFormRenderer imp
defaultDateTimeString = UtilHttp.encodeBlanks(modelFormField.getEntry(context, dateFindField.getDefaultDateTimeString(context)));
this.appendContentUrl(imgSrc, "/images/cal.gif");
}
- String defaultOptionFrom = dateFindField.getDefaultOptionFrom();
- String defaultOptionThru = dateFindField.getDefaultOptionThru();
+ String defaultOptionFrom = dateFindField.getDefaultOptionFrom(context);
+ String defaultOptionThru = dateFindField.getDefaultOptionThru(context);
String value2 = modelFormField.getEntry(context);
if (value2 == null) {
value2 = "";