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/28 23:42:08 UTC
svn commit: r1682343 - in
/ofbiz/branches/release14.12/framework/widget/src/org/ofbiz/widget:
model/ModelFormField.java renderer/macro/MacroFormRenderer.java
Author: nmalin
Date: Thu May 28 21:42:07 2015
New Revision: 1682343
URL: http://svn.apache.org/r1682343
Log:
Apply patch from OFBIZ-6415 renderTextFindField doesn't reselect operation dropdown or ignoreCase checkbox 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=1682343&r1=1682342&r2=1682343&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 Thu May 28 21:42:07 2015
@@ -3804,6 +3804,19 @@ public class ModelFormField {
return this.defaultOption;
}
+ public String getDefaultOption(Map<String, Object> context) {
+ String defaultOption = getDefaultOption();
+
+ 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)) {
+ defaultOption = (String) parameters.get(fieldName.concat("_op"));
+ }
+ }
+ return defaultOption;
+ }
+
public boolean getHideIgnoreCase() {
return this.hideIgnoreCase;
}
@@ -3816,6 +3829,19 @@ public class ModelFormField {
return this.ignoreCase;
}
+ public boolean getIgnoreCase(Map<String, Object> context) {
+ Boolean ignoreCase = getIgnoreCase();
+
+ 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)) {
+ ignoreCase = "Y".equals((String) parameters.get(fieldName.concat("_ic")));
+ }
+ }
+ return ignoreCase;
+ }
+
@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=1682343&r1=1682342&r2=1682343&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 Thu May 28 21:42:07 2015
@@ -1711,7 +1711,7 @@ public final class MacroFormRenderer imp
public void renderTextFindField(Appendable writer, Map<String, Object> context, TextFindField textFindField) throws IOException {
ModelFormField modelFormField = textFindField.getModelFormField();
- String defaultOption = textFindField.getDefaultOption();
+ String defaultOption = textFindField.getDefaultOption(context);
String className = "";
String alert = "false";
String opEquals = "";
@@ -1752,7 +1752,7 @@ public final class MacroFormRenderer imp
titleStyle = modelFormField.getTitleStyle();
}
String ignoreCase = UtilProperties.getMessage("conditional", "ignore_case", locale);
- boolean ignCase = textFindField.getIgnoreCase();
+ boolean ignCase = textFindField.getIgnoreCase(context);
boolean hideIgnoreCase = textFindField.getHideIgnoreCase();
StringWriter sr = new StringWriter();
sr.append("<@renderTextFindField ");