Odoo Web (MOVED TO GITHUB)

Merge lp:~openerp-dev/openerp-web/trunk-bug-872707-tpa into lp:openerp-web

  1. trunk-bug-872707-tpa
  2. Merge into trunk
Proposed by Turkesh Patel (openERP)
Status: Merged
Merge reported by: Xavier (Open ERP)
Merged at revision: not available
Proposed branch: lp:~openerp-dev/openerp-web/trunk-bug-872707-tpa
Merge into: lp:openerp-web
Diff against target: 12 lines (+1/-1)
1 file modified
addons/web/controllers/main.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/trunk-bug-872707-tpa
Reviewer Review Type Date Requested Status
OpenERP R&D Web Team Pending
Review via email: mp+79392@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/controllers/main.py'
2--- addons/web/controllers/main.py 2011-10-06 15:39:59 +0000
3+++ addons/web/controllers/main.py 2011-10-14 11:18:24 +0000
4@@ -1008,7 +1008,7 @@
5 Model = req.session.model(model)
6 context = req.session.eval_context(req.context)
7 res = Model.read([int(id)], [field, fieldname], context)[0]
8- filecontent = res.get(field, '')
9+ filecontent = base64.b64decode(res.get(field, ''))
10 if not filecontent:
11 return req.not_found()
12 else: