You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2015/03/10 15:12:06 UTC
svn commit: r1665561 - in /ofbiz/branches/release12.04/framework/widget:
dtd/widget-form.xsd src/org/ofbiz/widget/form/MacroFormRenderer.java
src/org/ofbiz/widget/form/ModelFormField.java
Author: jleroux
Date: Tue Mar 10 14:12:06 2015
New Revision: 1665561
URL: http://svn.apache.org/r1665561
Log:
Removes unrelated stuff committed by error in r1665544
Modified:
ofbiz/branches/release12.04/framework/widget/dtd/widget-form.xsd
ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
Modified: ofbiz/branches/release12.04/framework/widget/dtd/widget-form.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/widget/dtd/widget-form.xsd?rev=1665561&r1=1665560&r2=1665561&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/widget/dtd/widget-form.xsd (original)
+++ ofbiz/branches/release12.04/framework/widget/dtd/widget-form.xsd Tue Mar 10 14:12:06 2015
@@ -681,7 +681,6 @@ under the License.
<xs:sequence>
<xs:element ref="in-place-editor" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
- <xs:enumeration value="date-fix" />
<xs:attributeGroup ref="attlist.display"/>
</xs:complexType>
</xs:element>
Modified: ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=1665561&r1=1665560&r2=1665561&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original)
+++ ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Tue Mar 10 14:12:06 2015
@@ -50,7 +50,6 @@ import org.ofbiz.base.util.UtilValidate;
import org.ofbiz.base.util.string.FlexibleStringExpander;
import org.ofbiz.base.util.template.FreeMarkerWorker;
import org.ofbiz.entity.Delegator;
-import org.ofbiz.entity.util.EntityUtilProperties;
import org.ofbiz.webapp.control.RequestHandler;
import org.ofbiz.webapp.taglib.ContentUrlTag;
import org.ofbiz.widget.ModelWidget;
@@ -668,11 +667,6 @@ public class MacroFormRenderer implement
formattedMask = "9999-99-99 99:99:99";
}
}
- Delegator delegator = (Delegator) request.getAttribute("delegator");
- String timeFormat = "";
- if (UtilValidate.isNotEmpty(delegator)) {
- timeFormat = EntityUtilProperties.getPropertyValue("general", "displayTimeFormat", delegator);
- }
StringWriter sr = new StringWriter();
sr.append("<@renderDateTimeField ");
sr.append("name=\"");
@@ -737,8 +731,6 @@ public class MacroFormRenderer implement
sr.append(formName);
sr.append("\" mask=\"");
sr.append(formattedMask);
- sr.append("\" timeFormat=\"");
- sr.append(timeFormat);
sr.append("\" />");
executeMacro(writer, sr.toString());
this.addAsterisks(writer, context, modelFormField);
@@ -1610,10 +1602,6 @@ public class MacroFormRenderer implement
oddRowStyle = FlexibleStringExpander.expandString(modelForm.getOddRowStyle(), context);
}
}
-
- Delegator delegator = (Delegator)context.get("delegator");
- String defaultDateFormat = EntityUtilProperties.getPropertyValue("general.properties", "displayDateFindFormat", "yy-mm-dd", delegator);
-
StringWriter sr = new StringWriter();
sr.append("<@renderFormatItemRowOpen ");
sr.append(" formName=\"");
@@ -1966,7 +1954,7 @@ public class MacroFormRenderer implement
int size = 25;
int maxlength = 30;
String dateType = dateFindField.getType();
- if ("date".equals(dateType) || "date-fix".equals(dateType)) {
+ if ("date".equals(dateType)) {
size = maxlength = 10;
if (uiLabelMap != null) {
localizedInputTitle = uiLabelMap.get("CommonFormatDate");
@@ -2062,8 +2050,6 @@ public class MacroFormRenderer implement
sr.append(opUpThruDay);
sr.append("\" opIsEmpty=\"");
sr.append(opIsEmpty);
- sr.append("\" defaultDateFormat=\"");
- sr.append(defaultDateFormat);
sr.append("\" />");
executeMacro(writer, sr.toString());
Modified: ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=1665561&r1=1665560&r2=1665561&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original)
+++ ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Tue Mar 10 14:12:06 2015
@@ -63,7 +63,6 @@ import org.ofbiz.entity.model.ModelEntit
import org.ofbiz.entity.model.ModelField;
import org.ofbiz.entity.model.ModelReader;
import org.ofbiz.entity.util.EntityUtil;
-import org.ofbiz.entity.util.EntityUtilProperties;
import org.ofbiz.service.DispatchContext;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.ModelParam;
@@ -1994,14 +1993,19 @@ public class ModelFormField {
throw new IllegalArgumentException(errMsg);
}
} else if ("date".equals(this.type) && retVal.length() > 10) {
+ Locale locale = (Locale) context.get("locale");
+ if (locale == null) {
+ locale = Locale.getDefault();
+ }
+
StringToTimestamp stringToTimestamp = new DateTimeConverters.StringToTimestamp();
Timestamp timestamp = null;
try {
timestamp = stringToTimestamp.convert(retVal);
Date date = new Date(timestamp.getTime());
- Delegator delegator = (Delegator)context.get("delegator");
- String displayDateFormat = EntityUtilProperties.getPropertyValue("general.properties", "displayDateFormat", "dd-MM-yyyy", delegator);
- retVal = UtilDateTime.toDateString(date, displayDateFormat);
+
+ DateFormat dateFormatter = DateFormat.getDateInstance(DateFormat.SHORT, locale);
+ retVal = dateFormatter.format(date);
}
catch (ConversionException e) {
String errMsg = "Error formatting date using default instead [" + retVal + "]: " + e.toString();
@@ -2011,14 +2015,23 @@ public class ModelFormField {
}
} else if ("date-time".equals(this.type) && retVal.length() > 16) {
+ Locale locale = (Locale) context.get("locale");
+ TimeZone timeZone = (TimeZone) context.get("timeZone");
+ if (locale == null) {
+ locale = Locale.getDefault();
+ }
+ if (timeZone == null) {
+ timeZone = TimeZone.getDefault();
+ }
+
StringToTimestamp stringToTimestamp = new DateTimeConverters.StringToTimestamp();
Timestamp timestamp = null;
try {
timestamp = stringToTimestamp.convert(retVal);
Date date = new Date(timestamp.getTime());
- Delegator delegator = (Delegator)context.get("delegator");
- String displayDateTimeFormat = EntityUtilProperties.getPropertyValue("general.properties", "displayDateTimeFormat", "dd-MM-yyyy HH:mm:ss.SSS", delegator);
- retVal = UtilDateTime.toDateString(date, displayDateTimeFormat);
+
+ DateFormat dateFormatter = UtilDateTime.toDateTimeFormat(null, timeZone, locale);
+ retVal = dateFormatter.format(date);
}
catch (ConversionException e) {
String errMsg = "Error formatting date/time using default instead [" + retVal + "]: " + e.toString();