diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-04-04 11:20:03 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-04-04 11:20:03 +0200 |
| commit | d32420397d6500f46d3defa2a840e4f580a13496 (patch) | |
| tree | 4cdf23dbe8147fa8642f9f42e6778a7985eb7cae /addons/web/static/src | |
| parent | c0cf4049b2a4a7c51169ea88569fd7f89e503a59 (diff) | |
| parent | 251021796c25676f5c341e0a3fc3ba4c9feb85bb (diff) | |
[MERGE] forward port branch 12.0 up to 251021796c2
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/core/domain.js | 4 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/calendar/calendar_controller.js | 1 | ||||
| -rw-r--r-- | addons/web/static/src/scss/layout_background.scss | 7 |
3 files changed, 10 insertions, 2 deletions
diff --git a/addons/web/static/src/js/core/domain.js b/addons/web/static/src/js/core/domain.js index c31feb61a8f..00c8dcb83d4 100644 --- a/addons/web/static/src/js/core/domain.js +++ b/addons/web/static/src/js/core/domain.js @@ -258,8 +258,8 @@ var Domain = collections.Tree.extend({ }); break; case 'previous_year': - leftBoundaryParams.years = leftBoundaryParams.years ? leftBoundaryParams.years-- : -1; - rightBoundaryParams.years = rightBoundaryParams.years ? rightBoundaryParams.years-- : -1; + leftBoundaryParams.years = leftBoundaryParams.years ? leftBoundaryParams.years - 1 : -1; + rightBoundaryParams.years = rightBoundaryParams.years ? rightBoundaryParams.years - 1 : -1; break; } diff --git a/addons/web/static/src/js/views/calendar/calendar_controller.js b/addons/web/static/src/js/views/calendar/calendar_controller.js index af31c252898..b40da7ca0a5 100644 --- a/addons/web/static/src/js/views/calendar/calendar_controller.js +++ b/addons/web/static/src/js/views/calendar/calendar_controller.js @@ -272,6 +272,7 @@ var CalendarController = AbstractController.extend({ res_model: this.modelName, context: context, title: title, + view_id: this.formViewId || false, disable_multiple_selection: true, on_saved: function () { if (event.data.on_save) { diff --git a/addons/web/static/src/scss/layout_background.scss b/addons/web/static/src/scss/layout_background.scss index 9b137fde8c1..caeb1f0c2bf 100644 --- a/addons/web/static/src/scss/layout_background.scss +++ b/addons/web/static/src/scss/layout_background.scss @@ -82,3 +82,10 @@ } } } + +/* special case for displaying report in iframe */ +.o_in_iframe { + .o_background_header { + min-width: 0; + } +} |