diff options
| author | bth-openerp <bth@tinyerp.com> | 2013-09-30 15:54:30 +0530 |
|---|---|---|
| committer | bth-openerp <bth@tinyerp.com> | 2013-09-30 15:54:30 +0530 |
| commit | 8ecd77d367ffbc06dfe79e9e90e2ecad9e82461b (patch) | |
| tree | 05e7a1c4e2c3685ef74be348e2b21e4de3df9076 /addons/website/controllers/main.py | |
| parent | 1d1bd3a4a3e23ffe3222ba1b2f9d34a4d2cc5a29 (diff) | |
| parent | af96efffc9d12e827374841361e2fa89b426a59f (diff) | |
[MERGE]Merge lp:~openerp-dev/openobject-addons/trunk-website-al.
bzr revid: bth@tinyerp.com-20130930102430-vnjn78mn65mq03r0
Diffstat (limited to 'addons/website/controllers/main.py')
| -rw-r--r-- | addons/website/controllers/main.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py index 8b8f82a3678..7b0ae426553 100644 --- a/addons/website/controllers/main.py +++ b/addons/website/controllers/main.py @@ -265,16 +265,16 @@ class Website(openerp.addons.web.controllers.main.Home): hashed_session = hashlib.md5(request.session_id).hexdigest() retag = hashed_session try: - ids = Model.read(request.cr, request.uid, [('id', '=', id)], request.context) + id = int(id) + ids = Model.search(request.cr, request.uid, [('id', '=', id)], context=request.context) if not ids: - id = Model.read(request.cr, openerp.SUPERUSER_ID, [('id', '=', id), ('website_published', '=', True)], request.context)[0] - + id = Model.search(request.cr, openerp.SUPERUSER_ID, [('id', '=', id), ('website_published', '=', True)], context=request.context)[0] if etag: date = Model.read(request.cr, openerp.SUPERUSER_ID, [id], [last_update], request.context)[0].get(last_update) if hashlib.md5(date).hexdigest() == etag: return werkzeug.wrappers.Response(status=304) - res = Model.read(request.cr, openerp.SUPERUSER_ID, [id], [last_update, field], request.context)[0] + res = Model.read(request.cr, openerp.SUPERUSER_ID, [id], [last_update, field], context=request.context)[0] retag = hashlib.md5(res.get(last_update)).hexdigest() image_base64 = res.get(field) |