Bhumi Thakkar (Open ERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-bug-998128-bth into lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
Related bugs:
Bug #998128 in OpenERP Web: "Revision 2428 introduces exception on calendar
view."
https://bugs.launchpad.net/openerp-web/+bug/998128
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-bug-998128-bth/+merge/105974
Hello,
Put condition for 'node' in web.datetimepicker template and in
instance.web.DateTimeWidget class, change key name in 'format_client' and
'parse_client' functions when called function 'instance.web.format_value'.
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-bug-998128-bth/+merge/105974
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-bug-998128-bth.
=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js 2012-05-16 12:50:32 +0000
+++ addons/web/static/src/js/view_form.js 2012-05-16 13:18:18 +0000
@@ -2027,10 +2027,10 @@
}
},
parse_client: function(v) {
- return instance.web.parse_value(v, {"widget": this.type_of_date});
+ return instance.web.parse_value(v, {"type": this.type_of_date});
},
format_client: function(v) {
- return instance.web.format_value(v, {"widget": this.type_of_date});
+ return instance.web.format_value(v, {"type": this.type_of_date});
},
on_change: function() {
if (this.is_valid_()) {
=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml 2012-05-15 14:10:02 +0000
+++ addons/web/static/src/xml/base.xml 2012-05-16 13:18:18 +0000
@@ -1000,11 +1000,20 @@
<t t-name="web.datetimepicker">
<div class="oe_datepicker_root oe_form_field_datetime">
<input type="text" class="oe_datepicker_container" disabled="disabled" style="display: none;"/>
- <input type="text"
- t-att-name="widget.name"
- t-att-placeholder="widget.getParent().node.attrs.placeholder"
- t-attf-class="oe_datepicker_master field_#{widget.type_of_date} oe_form_field_#{widget.type_of_date}"
- /><img class="oe_input_icon oe_datepicker_trigger" t-att-src='_s + "/web/static/src/img/ui/field_calendar.png"'
+ <t t-if='widget.getParent().node'>
+ <input type="text"
+ t-att-name="widget.name"
+ t-att-placeholder="widget.getParent().node.attrs.placeholder"
+ t-attf-class="oe_datepicker_master field_#{widget.type_of_date} oe_form_field_#{widget.type_of_date}"
+ />
+ </t>
+ <t t-if='!widget.getParent().node'>
+ <input type="text"
+ t-att-name="widget.name"
+ t-attf-class="oe_datepicker_master field_#{widget.type_of_date} oe_form_field_#{widget.type_of_date}"
+ />
+ </t>
+ <img class="oe_input_icon oe_datepicker_trigger" t-att-src='_s + "/web/static/src/img/ui/field_calendar.png"'
title="Select date" width="16" height="16" border="0"/>
</div>
</t>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
