diff options
| author | Olivier Dony <odo@openerp.com> | 2014-08-13 17:30:06 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2014-08-13 17:30:06 +0200 |
| commit | b9275da8a52255d0fc3f914de9d406612e7dde50 (patch) | |
| tree | 9e6ddad2054cf3da4995763eb14f6cea7fdc1375 /addons/web | |
| parent | 7aa0376f3ec6e7e8bf1c4fb6fb5581a6f18f985e (diff) | |
| parent | 23cffab1f8cab7f456df56e6f1b002f4fa9b2ef0 (diff) | |
[MERGE] Forward-port 7.0 up to 23cffab
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/controllers/main.py | 8 | ||||
| -rw-r--r-- | addons/web/static/src/js/data_export.js | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 5030a977f18..31a2c52f99d 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1709,16 +1709,18 @@ class ExportFormat(object): raise NotImplementedError() def base(self, data, token): + params = simplejson.loads(data) model, fields, ids, domain, import_compat = \ operator.itemgetter('model', 'fields', 'ids', 'domain', 'import_compat')( - simplejson.loads(data)) + params) Model = request.session.model(model) - ids = ids or Model.search(domain, 0, False, False, request.context) + context = dict(req.context or {}, **params.get('context', {})) + ids = ids or Model.search(domain, 0, False, False, context) field_names = map(operator.itemgetter('name'), fields) - import_data = Model.export_data(ids, field_names, request.context).get('datas',[]) + import_data = Model.export_data(ids, field_names, context).get('datas',[]) if import_compat: columns_headers = field_names diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js index 252a5a378cc..e85e99eeca8 100644 --- a/addons/web/static/src/js/data_export.js +++ b/addons/web/static/src/js/data_export.js @@ -407,6 +407,7 @@ instance.web.DataExport = instance.web.Dialog.extend({ fields: exported_fields, ids: this.ids_to_export, domain: this.domain, + context: this.dataset.context, import_compat: !!this.$el.find("#import_compat").val(), })}, complete: instance.web.unblockUI, |