diff --git a/export_bg/models/export_bg_mixin.py b/export_bg/models/export_bg_mixin.py index d61612ed..3b57855f 100644 --- a/export_bg/models/export_bg_mixin.py +++ b/export_bg/models/export_bg_mixin.py @@ -43,11 +43,12 @@ def _export_chunk_bg(self, data, export_id, export_format): # Extract field names considering import_compat mode import_compat = params.get("import_compat", True) - field_names = [f["name"] for f in params["fields"]] + field_names = [f.get("name") or f.get("value") or f.get("id") for f in params["fields"]] if import_compat: field_labels = field_names else: - field_labels = [((f.get("label") or "").strip()) for f in params["fields"]] + field_names = [f.get("name") or f.get("id") for f in params["fields"]] + field_labels = [f.get("label") or f.get("string") for f in params["fields"]] export_data = self.export_data(field_names).get("datas", []) diff --git a/export_bg/static/src/views/list_controller.js b/export_bg/static/src/views/list_controller.js index 8f755af2..12839eca 100644 --- a/export_bg/static/src/views/list_controller.js +++ b/export_bg/static/src/views/list_controller.js @@ -11,7 +11,9 @@ patch(ListController.prototype, { const recordCount = resIds ? resIds.length : (this.model.root.count || 0); const exportedFields = fields.map((field) => ({ name: field.name || field.id, + value: field.name || field.id, label: field.label || field.string, + string: field.label || field.string, store: field.store, type: field.field_type || field.type, }));