[MERGE] from trunk

bzr revid: chm@openerp.com-20130726141841-a30nn35b63p2l3uh

1 files changed, 24 insertions, 17 deletions

diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js
index fb5e391effd..8de6cc506b9 100644
--- a/addons/web/static/src/js/data_export.js
+++ b/addons/web/static/src/js/data_export.js
@@ -71,7 +71,7 @@ instance.web.DataExport = instance.web.Dialog.extend({
                 opt.replaceChild(
                     document.createTextNode(
                         _.str.sprintf("%s — %s", format.label, format.error)),
-                    opt.childNodes[0])
+                    opt.childNodes[0]);
             }
             $fmts.append(opt);
         });
@@ -93,7 +93,7 @@ instance.web.DataExport = instance.web.Dialog.extend({
                 self.$el.find('#fields_list option').remove();
                 var export_id = self.$el.find('#saved_export_list option:selected').val();
                 if (export_id) {
-                    self.rpc('/web/export/namelist', {'model': self.dataset.model, export_id: parseInt(export_id)}).done(self.do_load_export_field);
+                    self.rpc('/web/export/namelist', {'model': self.dataset.model, export_id: parseInt(export_id, 10)}).done(self.do_load_export_field);
                 }
             });
             self.$el.find('#delete_export_list').click(function() {
@@ -215,7 +215,7 @@ instance.web.DataExport = instance.web.Dialog.extend({
             self.$el.find("tr[id='treerow-" + record.id + "']").click(function(e) {
                 if (e.shiftKey) {
                     var frst_click, scnd_click = '';
-                    if (self.row_index == 0) {
+                    if (self.row_index === 0) {
                         self.row_index = this.rowIndex;
                         frst_click = self.$el.find("tr[id^='treerow-']")[self.row_index-1];
                         $(frst_click).addClass("ui-selected");
@@ -378,21 +378,28 @@ instance.web.DataExport = instance.web.Dialog.extend({
         exported_fields.unshift({name: 'id', label: 'External ID'});
 
         var export_format = this.$el.find("#export_format").val();
-        var ids_to_export = this.$('#export_selection_only').prop('checked')
-                ? this.getParent().get_selected_ids()
-                : this.dataset.ids;
 
-        instance.web.blockUI();
-        this.session.get_file({
-            url: '/web/export/' + export_format,
-            data: {data: JSON.stringify({
-                model: this.dataset.model,
-                fields: exported_fields,
-                ids: ids_to_export,
-                domain: this.dataset.domain,
-                import_compat: !!this.$el.find("#import_compat").val(),
-            })},
-            complete: instance.web.unblockUI,
+        this.getParent().get_active_domain().then(function (domain) {
+            if (domain === undefined) {
+                var ids_to_export = self.getParent().get_selected_ids();
+                var domain = self.dataset.domain;
+            }
+            else {
+                var ids_to_export = false;
+                var domain = domain;
+            }
+            instance.web.blockUI();
+            self.session.get_file({
+                url: '/web/export/' + export_format,
+                data: {data: JSON.stringify({
+                    model: self.dataset.model,
+                    fields: exported_fields,
+                    ids: ids_to_export,
+                    domain: domain,
+                    import_compat: !!self.$el.find("#import_compat").val(),
+                })},
+                complete: instance.web.unblockUI,
+            });
         });
     },
     close: function() {