Merge pull request #409 from ctdegroot/uploadfs

Modify Table class so that uploadfs is respected when uploads_in_blob is set to True
2014-03-20 18:00:43 -05:00
parent 06cef8f9d1 9a92318d75
commit f8831b0bf3
1 changed files with 2 additions and 2 deletions
@@ -8735,9 +8735,9 @@ class Table(object):
            for field in fields:
                fn = field.uploadfield
                if isinstance(field, Field) and field.type == 'upload'\
-                        and fn is True:
+                        and fn is True and not field.uploadfs:
                    fn = field.uploadfield = '%s_blob' % field.name
-                if isinstance(fn, str) and not fn in uploadfields:
+                if isinstance(fn, str) and not fn in uploadfields and not field.uploadfs:
                    fields.append(Field(fn, 'blob', default='',
                                        writable=False, readable=False))