dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed issue 1673, propagation for format in archive tables

Browse Source
This commit is contained in:
Massimo
2013-09-20 12:47:15 -05:00
parent 2b1f150f02
commit f78e172eda
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@@ -1 +1 @@
Version 2.6.3-stable+timestamp.2013.09.19.22.17.43
Version 2.6.3-stable+timestamp.2013.09.20.12.45.53

6
gluon/dal.py
View File

@@ -8457,8 +8457,10 @@ class Table(object):
clones.append(field.clone(
unique=False, type=field.type if nfk else 'bigint'))
archive_db.define_table(
archive_name, Field(current_record,field_type,
label=current_record_label), *clones)
archive_name,
Field(current_record,field_type,label=current_record_label),
*clones,**dict(format=self._format))
self._before_update.append(
lambda qset,fs,db=archive_db,an=archive_name,cn=current_record:
archive_record(qset,fs,db[an],cn))

8
gluon/globals.py
View File

@@ -932,6 +932,14 @@ class Session(Storage):
else:
response.session_new = True
def _fixup_before_save(self):
response = current.response
rcookies = response.cookies
if self._forget and response.session_id_name in rcookies:
del rcookies[response.session_id_name]
elif self._secure and response.session_id_name in rcookies:
rcookies[response.session_id_name]['secure'] = True
def clear_session_cookies(sefl):
request = current.request
response = current.response

8
gluon/main.py
View File

@@ -503,12 +503,8 @@ def wsgibase(environ, responder):
# store cookies in headers
# ##################################################
rcookies = response.cookies
if session._forget and response.session_id_name in rcookies:
del rcookies[response.session_id_name]
elif session._secure:
rcookies[response.session_id_name]['secure'] = True
http_response.cookies2headers(rcookies)
session._fixup_before_save()
http_response.cookies2headers(response.cookies)
ticket = None