fixed issue 1673, propagation for format in archive tables
This commit is contained in:
@@ -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
|
||||||
|
|||||||
+4
-2
@@ -8457,8 +8457,10 @@ class Table(object):
|
|||||||
clones.append(field.clone(
|
clones.append(field.clone(
|
||||||
unique=False, type=field.type if nfk else 'bigint'))
|
unique=False, type=field.type if nfk else 'bigint'))
|
||||||
archive_db.define_table(
|
archive_db.define_table(
|
||||||
archive_name, Field(current_record,field_type,
|
archive_name,
|
||||||
label=current_record_label), *clones)
|
Field(current_record,field_type,label=current_record_label),
|
||||||
|
*clones,**dict(format=self._format))
|
||||||
|
|
||||||
self._before_update.append(
|
self._before_update.append(
|
||||||
lambda qset,fs,db=archive_db,an=archive_name,cn=current_record:
|
lambda qset,fs,db=archive_db,an=archive_name,cn=current_record:
|
||||||
archive_record(qset,fs,db[an],cn))
|
archive_record(qset,fs,db[an],cn))
|
||||||
|
|||||||
@@ -932,6 +932,14 @@ class Session(Storage):
|
|||||||
else:
|
else:
|
||||||
response.session_new = True
|
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):
|
def clear_session_cookies(sefl):
|
||||||
request = current.request
|
request = current.request
|
||||||
response = current.response
|
response = current.response
|
||||||
|
|||||||
+2
-6
@@ -503,12 +503,8 @@ def wsgibase(environ, responder):
|
|||||||
# store cookies in headers
|
# store cookies in headers
|
||||||
# ##################################################
|
# ##################################################
|
||||||
|
|
||||||
rcookies = response.cookies
|
session._fixup_before_save()
|
||||||
if session._forget and response.session_id_name in rcookies:
|
http_response.cookies2headers(response.cookies)
|
||||||
del rcookies[response.session_id_name]
|
|
||||||
elif session._secure:
|
|
||||||
rcookies[response.session_id_name]['secure'] = True
|
|
||||||
http_response.cookies2headers(rcookies)
|
|
||||||
|
|
||||||
ticket = None
|
ticket = None
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user