diff options
Diffstat (limited to 'addons/web/static/src/js')
| -rw-r--r-- | addons/web/static/src/js/search.js | 15 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 1 |
2 files changed, 9 insertions, 7 deletions
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 14987fab289..a26d87636d8 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -793,20 +793,21 @@ openerp.web.search.BooleanField = openerp.web.search.SelectionField.extend(/** @ * @extends openerp.web.search.DateField */ openerp.web.search.DateField = openerp.web.search.Field.extend(/** @lends openerp.web.search.DateField# */{ - /** - * enables date picker on the HTML widgets - */ + template: "SearchView.date", start: function () { this._super(); - this.$element.addClass('field_date').datepicker({ - dateFormat: 'yy-mm-dd' - }); + this.datewidget = new openerp.web.DateWidget(this); + this.datewidget.prependTo(this.$element); + this.datewidget.$element.find("input").attr("size", 15); + this.datewidget.$element.find("input").attr("autofocus", + this.attrs.default_focus === '1' ? 'autofocus' : undefined); + this.datewidget.set_value(this.defaults[this.attrs.name] || false); }, stop: function () { this.$element.datepicker('destroy'); }, get_value: function () { - return this.$element.val(); + return this.datewidget.get_value() || null; } }); /** diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index e2a83679da7..6d224a46109 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -1145,6 +1145,7 @@ openerp.web.DateTimeWidget = openerp.web.Widget.extend({ this.$element.find('button.oe_datepicker_close').click(function() { self.$element.find('.oe_datepicker').hide(); }); + this.set_readonly(false); }, picker: function() { return $.fn[this.jqueryui_object].apply(this.$element.find('.oe_datepicker_container'), arguments); |