Odoo Web (MOVED TO GITHUB)

Merge lp:~openerp-dev/openerp-web/7.0-opw-598983-msh into lp:openerp-web/7.0

  1. 7.0-opw-598983-msh
  2. Merge into 7.0
Proposed by Mohammed Shekha(Open ERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openerp-web/7.0-opw-598983-msh
Merge into: lp:openerp-web/7.0
Diff against target: 31 lines (+3/-3)
2 files modified
addons/web/static/src/js/views.js (+1/-1)
addons/web/static/src/xml/base.xml (+2/-2)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-opw-598983-msh
Reviewer Review Type Date Requested Status
Nicolas Vanhoren (OpenERP) Pending
Xavier (Open ERP) Pending
Review via email: mp+192838@code.launchpad.net

Description of the change

Hello,

Fixed the issue of datetime value displayed in help title of attachment, it is not according to browser's timezone.

Demo: To reproduce go through following bug.
https://bugs.launchpad.net/openobject-web/+bug/1238474

Thanks.

To post a comment you must log in.

Unmerged revisions

4041. By Mohammed Shekha(OpenERP)<email address hidden>

[FIX]Fixed the issue of datetime value displayed in attachments, it is not according to system timezone.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/static/src/js/views.js'
2--- addons/web/static/src/js/views.js 2013-06-21 12:44:49 +0000
3+++ addons/web/static/src/js/views.js 2013-10-28 05:01:28 +0000
4@@ -1118,7 +1118,7 @@
5 },
6 redraw: function() {
7 var self = this;
8- self.$el.html(QWeb.render('Sidebar', {widget: self}));
9+ self.$el.html(QWeb.render('Sidebar', {widget: self, format_value: instance.web.format_value}));
10
11 // Hides Sidebar sections when item list is empty
12 this.$('.oe_form_dropdown_section').each(function() {
13
14=== modified file 'addons/web/static/src/xml/base.xml'
15--- addons/web/static/src/xml/base.xml 2013-10-22 16:25:19 +0000
16+++ addons/web/static/src/xml/base.xml 2013-10-28 05:01:28 +0000
17@@ -635,12 +635,12 @@
18 <t t-if="item.create_uid and item.create_uid[0]" t-set="item.title">
19 <t t-raw="item.title"/><br/>
20 <b>Created by : </b><br/>
21- <t t-raw="item.create_uid[1] + ' ' + item.create_date"/>
22+ <t t-raw="item.create_uid[1] + ' ' + format_value(item.create_date, {'widget': 'datetime'})"/>
23 </t>
24 <t t-if="item.create_uid and item.write_uid and item.create_uid[0] != item.write_uid[0]" t-set="item.title">
25 <t t-raw="item.title"/><br/>
26 <b>Modified by : </b><br/>
27- <t t-raw="item.write_uid[1] + ' ' + item.write_date"/>
28+ <t t-raw="item.write_uid[1] + ' ' + format_value(item.write_date, {'widget': 'datetime'})"/>
29 </t>
30 </t>
31 <a class="oe_sidebar_action_a" t-att-title="item.title or ''" t-att-data-section="section.name" t-att-data-index="item_index" t-att-href="item.url" target="_blank">