diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-03-07 17:42:02 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-03-07 17:42:02 +0100 |
| commit | d67b410dfcd67d2540628d4f6be0daf8861c4a46 (patch) | |
| tree | 8803e293900a271cfa5f09645733e97e3c840bc0 /addons/web/static/src/js/views/pivot/pivot_controller.js | |
| parent | 43f0cbcc86008cedc6c184a994159d03795c233e (diff) | |
| parent | cb87388d727b9ec3f447d6212f5b9aeb0c16865f (diff) | |
[MERGE] forward port branch saas-15 up to cb87388d727
Diffstat (limited to 'addons/web/static/src/js/views/pivot/pivot_controller.js')
| -rw-r--r-- | addons/web/static/src/js/views/pivot/pivot_controller.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/addons/web/static/src/js/views/pivot/pivot_controller.js b/addons/web/static/src/js/views/pivot/pivot_controller.js index 731183e7efe..5f31c7103c7 100644 --- a/addons/web/static/src/js/views/pivot/pivot_controller.js +++ b/addons/web/static/src/js/views/pivot/pivot_controller.js @@ -126,6 +126,7 @@ var PivotController = AbstractController.extend({ var table = this.model.exportData(); if(table.measure_row.length + 1 > 256) { crash_manager.show_message(_t("For Excel compatibility, data cannot be exported if there are more than 256 columns.\n\nTip: try to flip axis, filter further or reduce the number of measures.")); + framework.unblockUI(); return; } framework.blockUI(); |