details: https://code.openbravo.com/erp/devel/pi/rev/ef8567be8b78
changeset: 14088:ef8567be8b78
user: Martin Taal <martin.taal <at> openbravo.com>
date: Wed Oct 26 15:18:26 2011 +0200
summary: Fixes issue 18484: Fields Updated and Created do not have the hour
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datetime.js
| 1 +
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/DateTimeUIDefinition.java
| 4 ++
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/DateUIDefinition.java
| 16 ++++++---
modules/org.openbravo.userinterface.smartclient/src/org/openbravo/userinterface/smartclient/templates/smartclient_types_js.ftl
| 3 +
4 files changed, 18 insertions(+), 6 deletions(-)
diffs (68 lines):
diff -r da5f8acef63a -r ef8567be8b78
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datetime.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datetime.js
Wed Oct 26 15:02:48 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-datetime.js
Wed Oct 26 15:18:26 2011 +0200
@@ -209,6 +209,7 @@
// == OBDateItem properties ==
isc.OBDateTimeItem.addProperties({
+ showTime: true,
blurValue: function() {
return isc.OBDateTimeItem.expandDateYear(this.dateFormat, this.getValue());
diff -r da5f8acef63a -r ef8567be8b78
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/DateTimeUIDefinition.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/DateTimeUIDefinition.java
Wed Oct 26 15:02:48 2011 +0200
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/DateTimeUIDefinition.java
Wed Oct 26 15:18:26 2011 +0200
@@ -40,6 +40,10 @@
return "OBDateTimeItem";
}
+ protected String getClientFormatObject() {
+ return "OB.Format.dateTime";
+ }
+
@Override
public synchronized Object createFromClassicString(String value) {
try {
diff -r da5f8acef63a -r ef8567be8b78
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/DateUIDefinition.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/DateUIDefinition.java
Wed Oct 26 15:02:48 2011 +0200
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/DateUIDefinition.java
Wed Oct 26 15:18:26 2011 +0200
@@ -126,18 +126,22 @@
public String getTypeProperties() {
final StringBuilder sb = new StringBuilder();
sb.append("editFormatter: function(value, field, component, record) {"
- + "return OB.Utilities.Date.JSToOB(value, OB.Format.date);" + "},"
+ + "return OB.Utilities.Date.JSToOB(value, " + getClientFormatObject()
+ ");" + "},"
+ "parseInput: function(value, field, component, record) {"
- + "return OB.Utilities.Date.OBToJS(value, OB.Format.date);" + "},");
+ + "return OB.Utilities.Date.OBToJS(value, " + getClientFormatObject()
+ ");" + "},");
sb.append("shortDisplayFormatter: function(value, field, component,
record) {"
- + "return OB.Utilities.Date.JSToOB(value, OB.Format.date);" + "},"
+ + "return OB.Utilities.Date.JSToOB(value, " + getClientFormatObject()
+ ");" + "},"
+ "normalDisplayFormatter: function(value, field, component, record) {"
- + "return OB.Utilities.Date.JSToOB(value, OB.Format.date);" + "},"
- + "createClassicString: function(value) {"
- + "return OB.Utilities.Date.JSToOB(value, OB.Format.date);" + "},");
+ + "return OB.Utilities.Date.JSToOB(value, " + getClientFormatObject()
+ ");" + "},"
+ + "createClassicString: function(value) {" + "return
OB.Utilities.Date.JSToOB(value, "
+ + getClientFormatObject() + ");" + "},");
return sb.toString();
}
+ protected String getClientFormatObject() {
+ return "OB.Format.date";
+ }
+
@Override
public String getCellAlign() {
return "left";
diff -r da5f8acef63a -r ef8567be8b78
modules/org.openbravo.userinterface.smartclient/src/org/openbravo/userinterface/smartclient/templates/smartclient_types_js.ftl
---
a/modules/org.openbravo.userinterface.smartclient/src/org/openbravo/userinterface/smartclient/templates/smartclient_types_js.ftl
Wed Oct 26 15:02:48 2011 +0200
+++
b/modules/org.openbravo.userinterface.smartclient/src/org/openbravo/userinterface/smartclient/templates/smartclient_types_js.ftl
Wed Oct 26 15:18:26 2011 +0200
@@ -55,3 +55,6 @@
return OB.Utilities.Date.JSToOB(this, OB.Format.dateTime);
});
+isc.Date.toShortDatetime = function(formatter, isDatetimeField) {
+ return OB.Utilities.Date.JSToOB(this, OB.Format.dateTime);
+};
\ No newline at end of file
------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Cisco Self-Assessment and learn
about Cisco certifications, training, and career opportunities.
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
