odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Fix date fields widgets 

bzr revid: fme@openerp.com-20120604093239-szs3brw3ioyg3dr0
This commit is contained in:
Fabien Meghazi 2012-06-04 11:32:39 +02:00
parent 6c8e451ead
commit d69df82d01
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/web/static/src/js/view_form.js
View File

@ -1957,7 +1957,7 @@ instance.web.form.FieldFloat = instance.web.form.FieldChar.extend({
});
instance.web.DateTimeWidget = instance.web.OldWidget.extend({
template: "web.datetimepicker",
template: "web.datepicker",
jqueryui_object: 'datetimepicker',
type_of_date: "datetime",
init: function(parent) {
@ -2038,12 +2038,11 @@ instance.web.DateTimeWidget = instance.web.OldWidget.extend({
instance.web.DateWidget = instance.web.DateTimeWidget.extend({
jqueryui_object: 'datepicker',
template: "web.datepicker",
type_of_date: "date"
});
instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
tagName: "span",
template: "FieldDatetime",
build_widget: function() {
return new instance.web.DateTimeWidget(this);
},
@ -2089,6 +2088,7 @@ instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(_.exten
}));
instance.web.form.FieldDate = instance.web.form.FieldDatetime.extend({
template: "FieldDate",
build_widget: function() {
return new instance.web.DateWidget(this);
}

22
addons/web/static/src/xml/base.xml
View File

@ -935,28 +935,22 @@
</div>
</t>
<t t-name="web.datepicker">
<t t-set="placeholder" t-value="widget.getParent().node and widget.getParent().node.attrs.placeholder"/>
<span class="oe_form_field oe_datepicker_root oe_form_field_date">
<span>
<t t-set="placeholder" t-value="widget.getParent().node and widget.getParent().node.attrs.placeholder"/>
<input type="text" class="oe_datepicker_container" disabled="disabled" style="display: none;"/>
<input type="text"
t-att-name="widget.name"
t-att-placeholder="placeholder"
t-attf-class="oe_datepicker_master field_#{widget.type_of_date} oe_form_field_#{widget.type_of_date}"
class="oe_datepicker_master"
/><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"/>
</span>
</t>
<t t-name="web.datetimepicker">
<t t-set="placeholder" t-value="widget.getParent().node and widget.getParent().node.attrs.placeholder"/>
<span class="oe_form_field 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="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"'
title="Select date" width="16" height="16" border="0"/>
</span>
<t t-name="FieldDate">
<span class="oe_form_field oe_datepicker_root oe_form_field_date"/>
</t>
<t t-name="FieldDatetime">
<span class="oe_form_field oe_datepicker_root oe_form_field_datetime"/>
</t>
<t t-name="FieldSelection">
<span class="oe_form_field oe_form_field_selection">