summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorFabien Meghazi <fme@openerp.com>2012-08-09 16:59:18 +0200
committerFabien Meghazi <fme@openerp.com>2012-08-09 16:59:18 +0200
commit33c2df88262beefe9b2f855ad279b3426a5e5441 (patch)
tree892a3f5a5839b06463ebdbd0c1777f249e0f7c9e /addons/web/static/src
parent53e59fa5dfa1f360b09e77cc9c625fe33a2bd6ab (diff)
parent594862e93a97b98be7b71e0ab0801d8724d74082 (diff)
[IMP] binary/image controller uses json for id parameter
bzr revid: fme@openerp.com-20120809145918-f66m3sy9v2ybkk11
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/view_form.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index b8acdfea4cd..4d06cb2d767 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -4616,8 +4616,9 @@ instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({
if (this.get('value') && ! /^\d+(\.\d*)? \w+$/.test(this.get('value'))) {
url = 'data:image/png;base64,' + this.get('value');
} else if (this.get('value')) {
+ var id = escape(JSON.stringify(this.view.datarecord.id || null));
url = '/web/binary/image?session_id=' + this.session.session_id + '&model=' +
- this.view.dataset.model +'&id=' + (this.view.datarecord.id || '') + '&field=' + this.name + '&t=' + (new Date().getTime());
+ this.view.dataset.model +'&id=' + id + '&field=' + this.name + '&t=' + (new Date().getTime());
} else {
url = "/web/static/src/img/placeholder.png";
}