fixed Issue 1478:field.uploadfolder instead of request.folder in accepts (sqlhtml.py), thanks szunny
This commit is contained in:
@@ -1 +1 @@
|
|||||||
Version 2.4.6-stable+timestamp.2013.05.06.18.36.25
|
Version 2.4.6-stable+timestamp.2013.05.06.19.09.29
|
||||||
|
|||||||
+2
-2
@@ -1456,8 +1456,8 @@ class SQLFORM(FORM):
|
|||||||
if not f:
|
if not f:
|
||||||
continue
|
continue
|
||||||
else:
|
else:
|
||||||
f = os.path.join(current.request.folder,
|
ufolder = field.uploadfolder or current.request.folder
|
||||||
os.path.normpath(f))
|
f = os.path.join(ufolder, os.path.normpath(f))
|
||||||
source_file = open(f, 'rb')
|
source_file = open(f, 'rb')
|
||||||
original_filename = os.path.split(f)[1]
|
original_filename = os.path.split(f)[1]
|
||||||
elif hasattr(f, 'file'):
|
elif hasattr(f, 'file'):
|
||||||
|
|||||||
Reference in New Issue
Block a user