details: /erp/devel/pi/rev/81d66d798cab
changeset: 12496:81d66d798cab
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Thu May 26 15:09:11 2011 +0100
summary: Fixed issue 17189. Timestamp of the attachments will be correct even
if timezones of client and server are different.
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/AttachmentsAH.java
| 9 ++++++---
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
| 9 ++++++---
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js
| 2 +-
3 files changed, 13 insertions(+), 7 deletions(-)
diffs (57 lines):
diff -r 472052a65263 -r 81d66d798cab
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/AttachmentsAH.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/AttachmentsAH.java
Thu May 26 15:03:06 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/AttachmentsAH.java
Thu May 26 15:09:11 2011 +0100
@@ -39,7 +39,6 @@
import org.openbravo.dal.service.OBDao;
import org.openbravo.model.ad.ui.Tab;
import org.openbravo.model.ad.utility.Attachment;
-import org.openbravo.service.json.JsonUtils;
import org.openbravo.utils.FileUtility;
public class AttachmentsAH extends BaseActionHandler {
@@ -111,8 +110,12 @@
try {
attachmentobj.put("id", attachment.getId());
attachmentobj.put("name", attachment.getName());
- SimpleDateFormat xmlDateTimeFormat = JsonUtils.createDateTimeFormat();
- attachmentobj.put("creationDate",
xmlDateTimeFormat.format(attachment.getCreationDate()));
+ final SimpleDateFormat dateFormat = new
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZZZZZ");
+ dateFormat.setLenient(true);
+ String date = dateFormat.format(attachment.getCreationDate());
+ String d1 = date.substring(0, date.length() - 2);
+ String d2 = date.substring(date.length() - 2, date.length());
+ attachmentobj.put("creationDate", d1 + ":" + d2);
attachmentobj.put("createdby", attachment.getCreatedBy().getName());
} catch (Exception e) {
throw new OBException("Error while reading attachments:", e);
diff -r 472052a65263 -r 81d66d798cab
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Thu May 26 15:03:06 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Thu May 26 15:09:11 2011 +0100
@@ -297,9 +297,12 @@
try {
obj.put("name", attachment.getName());
obj.put("id", attachment.getId());
- SimpleDateFormat xmlDateTimeFormat = new
SimpleDateFormat("yyyy-MM-dd-HH-mm-ss");
- xmlDateTimeFormat.setLenient(true);
- obj.put("creationDate", attachment.getCreationDate().getTime());
+ final SimpleDateFormat dateFormat = new
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZZZZZ");
+ dateFormat.setLenient(true);
+ String date = dateFormat.format(attachment.getCreationDate());
+ String d1 = date.substring(0, date.length() - 2);
+ String d2 = date.substring(date.length() - 2, date.length());
+ obj.put("creationDate", d1 + ":" + d2);
obj.put("createdby", attachment.getCreatedBy().getName());
} catch (JSONException e) {
log.error("Error while reading attachments", e);
diff -r 472052a65263 -r 81d66d798cab
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js
Thu May 26 15:03:06 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js
Thu May 26 15:09:11 2011 +0100
@@ -380,7 +380,7 @@
height: 20,
wrap: false
});
- var creationDate = OB.Utilities.getTimePassed(new
Date(attachment.creationDate));
+ var creationDate =
OB.Utilities.getTimePassed(isc.Date.parseSchemaDate(attachment.creationDate));
var attachmentBy = isc.Label.create({
height: 1,
className: 'OBNoteListGridAuthor',
------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery,
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now.
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
