From adf82c1267f1783b6bcee93d85ca8abaacbfdf23 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 6 May 2013 19:10:12 -0500 Subject: [PATCH] fixed Issue 1478:field.uploadfolder instead of request.folder in accepts (sqlhtml.py), thanks szunny --- VERSION | 2 +- gluon/sqlhtml.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index fba38365..3c82eef0 100644 --- a/VERSION +++ b/VERSION @@ -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 diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index 6f454b4e..507eb0d3 100644 --- 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'):