OpenERP Community Backports (Web)

Merge lp:~therp-nl/ocb-web/6.1_fix_1193563 into lp:ocb-web/6.1

  1. 6.1_fix_1193563
  2. Merge into 6.1
Proposed by Holger Brunn (Therp)
Status: Merged
Merged at revision: 2516
Proposed branch: lp:~therp-nl/ocb-web/6.1_fix_1193563
Merge into: lp:ocb-web/6.1
Diff against target: 20 lines (+2/-2)
1 file modified
addons/web/common/http.py (+2/-2)
To merge this branch: bzr merge lp:~therp-nl/ocb-web/6.1_fix_1193563
Reviewer Review Type Date Requested Status
Cristian Salamea (community) Approve
Guewen Baconnier @ Camptocamp Approve
Stefan Rijnhart (Opener) Approve
Review via email: mp+175997@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

LGTM

review: Approve
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) :
review: Approve
Revision history for this message
Cristian Salamea (ovnicraft) wrote :

I test it in 6.1, works well for reports (including wk reports).

Regards,

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/common/http.py'
2--- addons/web/common/http.py 2012-06-21 10:33:42 +0000
3+++ addons/web/common/http.py 2013-07-20 11:56:23 +0000
4@@ -304,7 +304,7 @@
5 response = werkzeug.wrappers.Response(data, headers=headers)
6 if cookies:
7 for k, v in cookies.iteritems():
8- response.set_cookie(k, v)
9+ response.set_cookie(k, str(v))
10 return response
11
12 def not_found(self, description=None):
13@@ -500,7 +500,7 @@
14 response = result
15
16 if hasattr(response, 'set_cookie'):
17- response.set_cookie(self.session_cookie, session.sid)
18+ response.set_cookie(self.session_cookie, str(session.sid))
19
20 return response(environ, start_response)
21

Subscribers

People subscribed via source and target branches