diff options
| author | Olivier Dony <odo@openerp.com> | 2015-01-29 13:50:35 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2015-01-29 13:50:51 +0100 |
| commit | c9b690f6b67cbcd382368097d206e07f080d892e (patch) | |
| tree | 75b4b9769de18761eaed3c7c0bdd1279522de55e /addons | |
| parent | a4c3670f662eb6ac07ed0ade144ac5648480cf8c (diff) | |
| parent | 4c2706d6858c4b7ec6db4b647dc2e3559f650cd8 (diff) | |
[MERGE] Forward-port latest 7.0 bugfixes, up to 4c2706d6858c4b7ec6db4b647dc2e3559f650cd8
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/web/controllers/main.py | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 295783dd384..53bf142f5ef 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1409,7 +1409,7 @@ class Binary(http.Controller): if filename_field: fields.append(filename_field) if data: - res = { field: data } + res = {field: data, filename_field: jdata.get('filename', None)} elif id: res = Model.read([int(id)], fields, context)[0] else: diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index f5db72de3fa..d6ba058d356 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -5300,14 +5300,17 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(instance. } else { instance.web.blockUI(); var c = instance.webclient.crashmanager; + var filename_fieldname = this.node.attrs.filename; + var filename_field = this.view.fields && this.view.fields[filename_fieldname]; this.session.get_file({ url: '/web/binary/saveas_ajax', data: {data: JSON.stringify({ model: this.view.dataset.model, id: (this.view.datarecord.id || ''), field: this.name, - filename_field: (this.node.attrs.filename || ''), + filename_field: (filename_fieldname || ''), data: instance.web.form.is_bin_size(value) ? null : value, + filename: filename_field ? filename_field.get('value') : null, context: this.view.dataset.get_context() })}, complete: instance.web.unblockUI, |