diff options
| author | Jérome Maes <jem@openerp.com> | 2015-02-19 14:54:35 +0100 |
|---|---|---|
| committer | Jérome Maes <jem@openerp.com> | 2015-02-19 14:54:35 +0100 |
| commit | 9c4c08b5db0e3bceffef2d6c7448f4bf7017bcb2 (patch) | |
| tree | 269acd4ef83d82540f7773bb60db8f84ae2a2b65 | |
| parent | 8e7c59f171c91485f193c78dbedde35a433bb03a (diff) | |
[FIX] im_chat : displayed date was in UTC, now using openerp.str_to_datetime to set it in the browser timezone. Also add missing data file in manifest.
| -rw-r--r-- | addons/im_chat/__openerp__.py | 1 | ||||
| -rw-r--r-- | addons/im_chat/static/src/js/im_chat.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/addons/im_chat/__openerp__.py b/addons/im_chat/__openerp__.py index 19b6172ad9c..aaa7b6fab01 100644 --- a/addons/im_chat/__openerp__.py +++ b/addons/im_chat/__openerp__.py @@ -19,6 +19,7 @@ chat in real time. It support several chats in parallel. 'security/ir.model.access.csv', 'security/im_security.xml', 'views/im_chat.xml', + 'im_chat_data.xml', ], 'depends' : ['base', 'web', 'bus'], 'qweb': ['static/src/xml/*.xml'], diff --git a/addons/im_chat/static/src/js/im_chat.js b/addons/im_chat/static/src/js/im_chat.js index 4929fad2050..43c9e14c9ee 100644 --- a/addons/im_chat/static/src/js/im_chat.js +++ b/addons/im_chat/static/src/js/im_chat.js @@ -344,7 +344,7 @@ if(!m.from_id){ m.from_id = [false, get_anonymous_name()]; } - m.create_date = moment.utc(m.create_date).format('YYYY-MM-DD HH:mm:ss'); + m.create_date = moment(openerp.str_to_datetime(m.create_date)).format('YYYY-MM-DD HH:mm:ss'); return m; }); this.set("messages", _.sortBy(this.get("messages").concat(messages), function(m){ return m.id; })); |
