Merge lp:~openerp-dev/openerp-web/7.0-opw-593892-msh into lp:openerp-web/7.0

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of save listed fields in export, fields disappears after saving field's list.

Demo:- Select any record of any list view and Export -> selects fields -> Save the field list.
Issue 1. List Disappear
Issue 2. Saved Field List selection doesn't rendered.
Issue 3. After deletion of saved list, that saved field list should be removed.

The first issue is that the callback written is not going to call so put it in then method, also rpc returns response result so no need to again do export_list_id.result.

Fixed all described stuff.

Thanks.

[Martin Trigaux (OpenERP) (mat-openerp)]

Thanks for the patch, merged in 7.0

revno: 4152 [merge]
revision-id: <email address hidden>

review: Approve

=== modified file 'addons/web/static/src/js/data_export.js'
--- addons/web/static/src/js/data_export.js	2013-05-30 10:04:20 +0000
+++ addons/web/static/src/js/data_export.js	2013-06-19 04:53:26 +0000
@@ -101,6 +101,7 @@
                 if (select_exp.val()) {
                     self.exports.unlink([parseInt(select_exp.val(), 10)]);
                     select_exp.remove();
+                    self.$el.find("#fields_list option").remove();
                     if (self.$el.find('#saved_export_list option').length <= 1) {
                         self.$el.find('#ExistsExportList').hide();
                     }
@@ -148,18 +149,17 @@
             export_fields: _(fields).map(function (field) {
                 return [0, 0, {name: field}];
             })
-        }, function (export_list_id) {
-            if (!export_list_id.result) {
+        }).then(function (export_list_id) {
+            if (!export_list_id) {
                 return;
             }
+            if (!self.$el.find("#saved_export_list").length || self.$el.find("#saved_export_list").is(":hidden")) {
+                self.show_exports_list();
+            }
             self.$el.find("#saved_export_list").append(
-                    new Option(value, export_list_id.result));
-            if (self.$el.find("#saved_export_list").is(":hidden")) {
-                self.show_exports_list();
-            }
+                    new Option(value, export_list_id));
         });
         this.on_show_save_list();
-        this.$el.find("#fields_list option").remove();
     },
     on_click: function(id, record) {
         var self = this;