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

[Mohammed Shekha(Open ERP)]

Hello,

Export using saved field list gives wrong header for relational fields, which creates problem while import same exported file.

Demo: Go to any view say for example Sale Order and then just select any record and then open Export dialog, select some fields which are kind of relational field and then just Export to file.

Now without closing dialog save those fields, close the dialog and re-open export dialog, from saved list open fields list which just saved and then export data to file.

Now compare label of the header for both files, file which we created using Saved field list will not have /id for relational field, if header are without /id in relational field then it may create issue while importing the same file.

Thanks.

[lp:~openerp-dev/openerp-web/7.0-opw-603113-msh]

4128. By Martin Trigaux (OpenERP) on 2014-01-29

[FIX] attachement: display error message (removed inexistant template) and redraw the window (to avoid getting stucked)

4129. By Martin Trigaux (OpenERP) on 2014-01-31

[IMP] attachement: remove unnecessary redraw added at rev 4128 and change message to be the same than in mail

4130. By Launchpad Translations on behalf of openerp on 2014-02-03

Launchpad automatic translations update.

4131. By jke-openerp on 2014-02-03

[MERGE] Merge with 7.0-fix-css-clearfix-jke - bug clearfix on oe_title and oe_form_group

4132. By Launchpad Translations on behalf of openerp on 2014-02-04

Launchpad automatic translations update.

4133. By Martin Trigaux (OpenERP) on 2014-02-04

[FIX] css: remove height: 18px on .oe_facet_value property to avoid long filter name to exceed the size of the box (on 2 lines)

4134. By Martin Trigaux (OpenERP) on 2014-02-05

[MERGE] [FIX] search: make sure search view is not destroyed when starting SearchView widget
This avoids getting the error 'Cannot call method 'getParent' of undefined'

4135. By Launchpad Translations on behalf of openerp on 2014-02-06

Launchpad automatic translations update.

4136. By Martin Trigaux (OpenERP) on 2014-02-06

[IMP] reference fields: display a more user-friendly window title when open a chosen many2one record in reference field

4137. By Mohammed Shekha(OpenERP)<email address hidden> on 2014-02-10

[FIX]Web Export: Refixed the issue of Export using saved field list gives wrong header for relational fields, which creates problem while import same exported file, also fixed the issue of fields order changed in saved fields due to revision 4115.

[Mohammed Shekha(Open ERP) (msh-openerp)]

Hello,

Along with issue of saved fields returning field's header wrong also fixed the issue of saved fields changes the order of the fields while re-fetching saved field list.

Demo: Export in any view -> select some fields and Save field list anf then reload that saved field list, check order of the saved field list has been changed, this does not create any block issue but while exporting order of the field is important because sometimes export is going to be matched with another system's data.

Thanks.

Unmerged revisions

4137. By Mohammed Shekha(OpenERP)<email address hidden> on 2014-02-10

[FIX]Web Export: Refixed the issue of Export using saved field list gives wrong header for relational fields, which creates problem while import same exported file, also fixed the issue of fields order changed in saved fields due to revision 4115.

=== modified file 'addons/web/controllers/main.py'
--- addons/web/controllers/main.py	2014-01-23 17:08:36 +0000
+++ addons/web/controllers/main.py	2014-02-10 09:11:00 +0000
@@ -1517,13 +1517,18 @@
         export = req.session.model("ir.exports").read([export_id])[0]
         export_fields_list = req.session.model("ir.exports.line").read(
             export['export_fields'])
+        def convert_field(f):
+            field_name = f['name']
+            if field_name.split('/') and field_name.split('/')[-1] == 'id':
+                 return '/'.join(field_name.split('/')[:-1])
+            return field_name
 
         fields_data = self.fields_info(
-            req, model, map(operator.itemgetter('name'), export_fields_list))
+            req, model, map(convert_field, export_fields_list))
 
         return [
-            {'name': field_name, 'label': fields_data[field_name]}
-            for field_name in fields_data.keys()
+                {'name': field['name'], 'label': fields_data[field['name']]}
+                for field in export_fields_list if field['name'] in fields_data
         ]
 
     def fields_info(self, req, model, export_fields):
@@ -1571,8 +1576,10 @@
                     subfields
                 ))
             elif base in fields:
-                info[base] = fields[base]['string']
-
+                if 'relation' in fields[base]:
+                    info[base+'/id'] = fields[base]['string']
+                else :
+                    info[base] = fields[base]['string']
         return info
 
     def graft_subfields(self, req, model, prefix, prefix_string, fields):
 
=== 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	2014-02-10 09:11:00 +0000
@@ -355,8 +355,9 @@
         }
     },
     get_fields: function() {
+        var self = this;
         var export_fields = this.$("#fields_list option").map(function() {
-            return $(this).val();
+            return self.records[this.value] || $(this).val();
         }).get();
         if (!export_fields.length) {
             alert(_t("Please select fields to save export list..."));