fixed Issue 1478:field.uploadfolder instead of request.folder in accepts (sqlhtml.py), thanks szunny

2013-05-06 19:10:12 -05:00
parent 4d98b72702
commit adf82c1267
2 changed files with 3 additions and 3 deletions
--- a/2
+++ b/2
@@ -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
--- a/gluon/sqlhtml.py
+++ b/gluon/sqlhtml.py
@@ -1456,8 +1456,8 @@ class SQLFORM(FORM):
                    if not f:
                        continue
                    else:
-                        f = os.path.join(current.request.folder,
-                                         os.path.normpath(f))
+                        ufolder = field.uploadfolder or current.request.folder
+                        f = os.path.join(ufolder, os.path.normpath(f))
                        source_file = open(f, 'rb')
                        original_filename = os.path.split(f)[1]
                elif hasattr(f, 'file'):