diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-06-09 16:43:27 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-06-09 16:43:27 +0200 |
| commit | cc38b93ab2a6daf9c5badbc387cff20d1a01ddee (patch) | |
| tree | d5d9942c4101f836a247e609266d3d39f1eeb4ee /addons/web | |
| parent | fb504f3cbd41dc52a81d76aa54d83117730671d0 (diff) | |
| parent | 49f819a7a797f0c046337118847f143197714e03 (diff) | |
[MERGE] forward port branch saas-15 up to 49f819a7a79
Diffstat (limited to 'addons/web')
4 files changed, 9 insertions, 1 deletions
diff --git a/addons/web/static/lib/bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js b/addons/web/static/lib/bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js index 807bdff70dd..8f0724bbb00 100644 --- a/addons/web/static/lib/bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js +++ b/addons/web/static/lib/bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js @@ -421,6 +421,12 @@ element.children().first().after(widget); } + // !! ODOO FIX START !! + var parentOffset = parent.offset(); + position.top = offset.top - parentOffset.top; + position.left = offset.left - parentOffset.left; + // !! ODOO FIX END !! + // Top and bottom logic if (vertical === 'auto') { if (offset.top + widget.height() * 1.5 >= $(window).height() + $(window).scrollTop() && diff --git a/addons/web/static/src/js/widgets/date_picker.js b/addons/web/static/src/js/widgets/date_picker.js index 353a5dc78f2..76281d9366a 100644 --- a/addons/web/static/src/js/widgets/date_picker.js +++ b/addons/web/static/src/js/widgets/date_picker.js @@ -42,6 +42,7 @@ var DateWidget = Widget.extend({ locale : moment.locale(), allowInputToggle: true, keyBinds: null, + widgetParent: 'body', }); }, /** diff --git a/addons/web/static/src/less/webclient.less b/addons/web/static/src/less/webclient.less index 2f9878fbdc3..5e84d74b599 100644 --- a/addons/web/static/src/less/webclient.less +++ b/addons/web/static/src/less/webclient.less @@ -12,6 +12,7 @@ a { // General // ------------------------------------------------------------------ .o_web_client { + position: relative; // normally useless but required by bootstrap-datepicker background-color: @odoo-webclient-background-color; } .o_text_overflow { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index c4a3cc3939f..dbd52954367 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -24,7 +24,7 @@ <div t-name="CrashManager.warning" class="o_dialog_warning"> <t t-js="d"> - var message = d.message ? d.message : d.error.data.message; + var message = (d.message !== undefined) ? d.message : d.error.data.message; d.html_error = context.engine.tools.html_escape(message).replace(/\n/g, '<br/>'); </t> <t t-raw="html_error"/> |