[IMP] don't mess up ordering of fields saved in an exports list

bzr revid: xmo@openerp.com-20110905152442-wcczebz4rk9g7tjd

2 files changed, 7 insertions, 6 deletions

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 054112b9beb..cf5bd2c0f46 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1149,9 +1149,10 @@ class Export(View):
         fields_data = self.fields_info(
             req, model, map(operator.itemgetter('name'), export_fields_list))
 
-        return dict(
-            (field['name'], fields_data[field['name']])
-            for field in export_fields_list)
+        return [
+            {'name': field['name'], 'label': fields_data[field['name']]}
+            for field in export_fields_list
+        ]
 
     def fields_info(self, req, model, export_fields):
         info = {}
diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js
index 71b5fb4ba52..7a738d8d1e8 100644
--- a/addons/web/static/src/js/data_export.js
+++ b/addons/web/static/src/js/data_export.js
@@ -106,9 +106,9 @@ openerp.web.DataExport = openerp.web.Dialog.extend({
     },
     do_load_export_field: function(field_list) {
         var export_node = this.$element.find("#fields_list");
-        for (var key in field_list) {
-            export_node.append(new Option(field_list[key], key));
-        }
+        _(field_list).each(function (field) {
+            export_node.append(new Option(field.label, field.name));
+        });
     },
     on_show_save_list: function() {
         var self = this;