From 70fdc76062d27ca1449b9421f7f8866a66ee3243 Mon Sep 17 00:00:00 2001 From: John Touba Date: Thu, 12 Oct 2017 15:47:31 +0200 Subject: [PATCH] [IMP] Up version to work with version 10 --- web_widget_datepicker_options/__manifest__.py | 2 - .../static/src/js/datepicker.js | 48 +++++++++---------- web_widget_datepicker_options/view/qweb.xml | 10 ++-- 3 files changed, 29 insertions(+), 31 deletions(-) diff --git a/web_widget_datepicker_options/__manifest__.py b/web_widget_datepicker_options/__manifest__.py index 67b23c1e..7033b3c8 100644 --- a/web_widget_datepicker_options/__manifest__.py +++ b/web_widget_datepicker_options/__manifest__.py @@ -32,6 +32,4 @@ ], "author": "Vincent Vinet, " "Odoo Community Association (OCA)", - 'installable': False, - "active": False, } diff --git a/web_widget_datepicker_options/static/src/js/datepicker.js b/web_widget_datepicker_options/static/src/js/datepicker.js index 304f119b..654c4ac3 100644 --- a/web_widget_datepicker_options/static/src/js/datepicker.js +++ b/web_widget_datepicker_options/static/src/js/datepicker.js @@ -18,36 +18,34 @@ */ /*global openerp, _, $ */ -openerp.web_widget_datepicker_options = function (instance) { - +odoo.define('web_widget_datepicker_options.web_widget_datepicker_options', function (require) { "use strict"; - instance.web.form.FieldDatetime.include({ - initialize_content: function() { - this._super(); - var self = this; - if (this.datewidget) { - if (typeof this.options.datepicker === 'object') { - $.map(this.options.datepicker, function(value, key) { - self.datewidget.picker('option', key, value); - }); - } + var core = require('web.core'); + var datepicker = require('web.datepicker'); + + var FieldDate = core.form_widget_registry.get('date'); + var FieldDatetime = core.form_widget_registry.get('datetime'); + + FieldDatetime.include({ + build_widget: function() { + var options = {} + if (this.options && this.options.datepicker){ + options = this.options.datepicker } - } + return new datepicker.DateTimeWidget(this, options); + }, }); - instance.web.form.FieldDate.include({ - initialize_content: function() { - this._super(); - var self = this; - if (this.datewidget) { - if (typeof this.options.datepicker === 'object') { - $.map(this.options.datepicker, function(value, key) { - self.datewidget.picker('option', key, value); - }); - } + FieldDate.include({ + build_widget: function() { + var options = {} + if (this.options && this.options.datepicker){ + options = this.options.datepicker } - } + return new datepicker.DateWidget(this, options); + }, }); -}; + +}); \ No newline at end of file diff --git a/web_widget_datepicker_options/view/qweb.xml b/web_widget_datepicker_options/view/qweb.xml index 9921348d..2f3ca0b5 100644 --- a/web_widget_datepicker_options/view/qweb.xml +++ b/web_widget_datepicker_options/view/qweb.xml @@ -1,10 +1,12 @@ - + + + -