fixed cache expiration in grid downloads, thanks Niphlod

This commit is contained in:
mdipierro committed 2013-02-04 15:12:15 -06:00
1 parent 8f76efeb2f
commit 9069f06857
4 files changed
+8 -8

No files matched your search

+1 -1
View File
@@ -1 +1 @@
Version 2.4.1-alpha.2+timestamp.2013.02.04.10.02.48 Version 2.4.1-alpha.2+timestamp.2013.02.04.15.11.29
+1 -1
View File
@@ -9131,7 +9131,7 @@ class Field(Expression):
stream = self.uploadfs.open(name, 'rb') stream = self.uploadfs.open(name, 'rb')
else: else:
# ## if file is on regular filesystem # ## if file is on regular filesystem
stream = open(pjoin(file_properties['path'], name), 'rb') stream = pjoin(file_properties['path'], name)
return (filename, stream) return (filename, stream)
def retrieve_file_properties(self, name, path=None): def retrieve_file_properties(self, name, path=None):
+4 -4
View File
@@ -308,8 +308,8 @@ class Response(Storage):
chunk_size=DEFAULT_CHUNK_SIZE, chunk_size=DEFAULT_CHUNK_SIZE,
request=None, request=None,
attachment=False, attachment=False,
filename=None, filename=None
): ):
""" """
if a controller function:: if a controller function::
@@ -403,8 +403,8 @@ class Response(Storage):
raise HTTP(404) raise HTTP(404)
headers = self.headers headers = self.headers
headers['Content-Type'] = contenttype(name) headers['Content-Type'] = contenttype(name)
if download_filename == None: if download_filename == None:
download_filename = filename download_filename = filename
if attachment: if attachment:
headers['Content-Disposition'] = \ headers['Content-Disposition'] = \
'attachment; filename="%s"' % download_filename.replace('"','\"') 'attachment; filename="%s"' % download_filename.replace('"','\"')
+2 -2
View File
@@ -46,8 +46,8 @@ def stream_file_or_304_or_206(
request=None, request=None,
headers={}, headers={},
status=200, status=200,
error_message=None, error_message=None
): ):
if error_message is None: if error_message is None:
error_message = rewrite.THREAD_LOCAL.routes.error_message % 'invalid request' error_message = rewrite.THREAD_LOCAL.routes.error_message % 'invalid request'
try: try: