diff options
| author | Fabien Meghazi <fme@openerp.com> | 2011-10-05 17:57:40 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2011-10-05 17:57:40 +0200 |
| commit | 1cde2fa2de57ab95a6947a73e890cebe012df63f (patch) | |
| tree | 0e125853a22e78af37cfd5fa3de7478db200d9d3 | |
| parent | 65745d5142abcd4ecc426a429c9d919dbcb8ebc3 (diff) | |
[FIX] Fixed addons path for binaries. Improved placeholder.
bzr revid: fme@openerp.com-20111005155740-ufdr7lwp4abpsfsu
| -rw-r--r-- | addons/web/controllers/main.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 9be0794a8bb..5e8efe3b1bd 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1025,16 +1025,17 @@ class Binary(openerpweb.Controller): try: if not id: - res = Model.default_get([field], context).get(field, '') + res = Model.default_get([field], context).get(field) else: - res = Model.read([int(id)], [field], context)[0].get(field, '') + res = Model.read([int(id)], [field], context)[0].get(field) image_data = base64.b64decode(res) except (TypeError, xmlrpclib.Fault): image_data = self.placeholder(req) return req.make_response(image_data, [ ('Content-Type', 'image/png'), ('Content-Length', len(image_data))]) def placeholder(self, req): - return open(os.path.join(req.addons_path, 'web', 'static', 'src', 'img', 'placeholder.png'), 'rb').read() + addons_path = openerpweb.addons_manifest['web']['addons_path'] + return open(os.path.join(addons_path, 'web', 'static', 'src', 'img', 'placeholder.png'), 'rb').read() @openerpweb.httprequest def saveas(self, req, model, id, field, fieldname, **kw): |