[MERGE] forward port branch 10.0 up to 00e169c05a2

2 files changed, 17 insertions, 9 deletions

diff --git a/addons/web/static/src/js/widgets/data_export.js b/addons/web/static/src/js/widgets/data_export.js
index d3135f86ba6..c74b89af11b 100644
--- a/addons/web/static/src/js/widgets/data_export.js
+++ b/addons/web/static/src/js/widgets/data_export.js
@@ -207,9 +207,15 @@ var DataExport = Dialog.extend({
         this.records = {};
         this.dataset = dataset;
         this.exports = new data.DataSetSearch(this, 'ir.exports', this.dataset.get_context());
-        
+
         this.row_index = 0;
         this.row_index_level = 0;
+
+        // The default for the ".modal_content" element is "max-height: 100%;"
+        // but we want it to always expand to "height: 100%;" for this modal.
+        // This can be achieved thanks to LESS modification without touching
+        // the ".modal-content" rules... but not with Internet explorer (11).
+        this.$modal.find(".modal-content").css("height", "100%");
     },
     start: function() {
         var self = this;
@@ -261,7 +267,7 @@ var DataExport = Dialog.extend({
 
         function do_setup_export_formats(formats) {
             var $fmts = self.$('.o_export_format');
-            
+
             _.each(formats, function(format, i) {
                 var $radio = $('<input/>', {type: 'radio', value: format.tag, name: 'o_export_format_name'});
                 var $label = $('<label/>', {html: format.label});
@@ -362,7 +368,7 @@ var DataExport = Dialog.extend({
     },
     on_show_data: function(records, expansion) {
         var self = this;
-    
+
         if(expansion) {
             this.$('.o_export_tree_item[data-id="' + expansion + '"]')
                 .addClass('open')
diff --git a/addons/web/static/src/less/data_export.less b/addons/web/static/src/less/data_export.less
index 3f596bea27d..01a1da80134 100644
--- a/addons/web/static/src/less/data_export.less
+++ b/addons/web/static/src/less/data_export.less
@@ -1,8 +1,8 @@
 .o_web_client .o_export {
-
-    .o-flex(0, 1, 1000px);
+    .o-flex(1, 1, auto);
     .o-flex-display();
     .o-flex-flow(column, nowrap);
+    min-height: 0;
 
     > p, > .row {
         .o-flex(0, 0, auto);
@@ -28,8 +28,9 @@
     }
 
     .o_export_panel {
-        .o-flex(1, 0, 0);
+        .o-flex(1, 1, auto);
         position: relative;
+        min-height: 0;
 
         > div {
             height: 100%;
@@ -59,9 +60,10 @@
             .o_left_field_panel, .o_fields_list {
                 border: 1px solid @odoo-brand-lightsecondary;
                 overflow: auto;
-                .o-flex(1, 0, 0);
+                .o-flex(1, 1, auto);
+                min-height: 0;
             }
-            
+
             .o_export_tree_item {
                 cursor: pointer;
                 position: relative;
@@ -72,7 +74,7 @@
                     background-color: @odoo-brand-primary;
                     color: white;
                 }
-           
+
                 .o_expand_parent {
                     .o-position-absolute(@top: 4px, @left: 5px);
                 }