dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Field(...'upload',default=path) looks in current app folder, thanks Marin

Browse Source
This commit is contained in:
mdipierro
2012-08-02 10:17:15 -05:00
parent 071b39f39b
commit 923857b957
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-08-02 00:17:19) dev Version 2.00.0 (2012-08-02 10:17:12) dev
gluon/sqlhtml.py
+6 -8
View File
@@ -17,6 +17,7 @@ try:
from urlparse import parse_qs as psq from urlparse import parse_qs as psq
except ImportError: except ImportError:
from cgi import parse_qs as psq from cgi import parse_qs as psq
import os
from http import HTTP from http import HTTP
from html import XML, SPAN, TAG, A, DIV, CAT, UL, LI, TEXTAREA, BR, IMG, SCRIPT from html import XML, SPAN, TAG, A, DIV, CAT, UL, LI, TEXTAREA, BR, IMG, SCRIPT
from html import FORM, INPUT, LABEL, OPTION, SELECT, BUTTON from html import FORM, INPUT, LABEL, OPTION, SELECT, BUTTON
@@ -33,7 +34,7 @@ import datetime
import urllib import urllib
import re import re
import cStringIO import cStringIO
from gluon.html import INPUT from gluon import current, redirect, A, URL, DIV, H3, UL, LI, SPAN, INPUT
table_field = re.compile('[\w_]+\.[\w_]+') table_field = re.compile('[\w_]+\.[\w_]+')
widget_class = re.compile('^\w*') widget_class = re.compile('^\w*')
@@ -765,7 +766,6 @@ class SQLFORM(FORM):
labels={'name': 'Your name'}, labels={'name': 'Your name'},
linkto=URL(f='table/db/') linkto=URL(f='table/db/')
""" """
from gluon import current
T = current.T T = current.T
self.ignore_rw = ignore_rw self.ignore_rw = ignore_rw
@@ -1241,8 +1241,10 @@ class SQLFORM(FORM):
elif hasattr(f, 'file'): elif hasattr(f, 'file'):
(source_file, original_filename) = (f.file, f.filename) (source_file, original_filename) = (f.file, f.filename)
elif isinstance(f, (str, unicode)): elif isinstance(f, (str, unicode)):
# warning: possible IOError exception f = os.path.join(current.request.folder,
(source_file, original_filename) = (open(f, 'rb'), f) os.path.normpath(f))
source_file = open(f, 'rb')
original_filename = os.path.split(f)[1]
newfilename = field.store(source_file, original_filename, newfilename = field.store(source_file, original_filename,
field.uploadfolder) field.uploadfolder)
# this line is for backward compatibility only # this line is for backward compatibility only
@@ -1375,7 +1377,6 @@ class SQLFORM(FORM):
@staticmethod @staticmethod
def build_query(fields,keywords): def build_query(fields,keywords):
from gluon import current
request = current.request request = current.request
if isinstance(keywords,(tuple,list)): if isinstance(keywords,(tuple,list)):
keywords = keywords[0] keywords = keywords[0]
@@ -1393,7 +1394,6 @@ class SQLFORM(FORM):
@staticmethod @staticmethod
def search_menu(fields,search_options=None): def search_menu(fields,search_options=None):
from gluon import current
T = current.T T = current.T
search_options = search_options or { search_options = search_options or {
'string':['=','!=','<','>','<=','>=','starts with','contains'], 'string':['=','!=','<','>','<=','>=','starts with','contains'],
@@ -1544,7 +1544,6 @@ class SQLFORM(FORM):
elif not isinstance(ui,dict): elif not isinstance(ui,dict):
raise RuntimeError,'SQLFORM.grid ui argument must be a dictionary' raise RuntimeError,'SQLFORM.grid ui argument must be a dictionary'
from gluon import current, redirect
db = query._db db = query._db
T = current.T T = current.T
request = current.request request = current.request
@@ -2091,7 +2090,6 @@ class SQLFORM(FORM):
linked_tables is a optional list of tablenames of tables linked_tables is a optional list of tablenames of tables
to be linked to be linked
""" """
from gluon import current, A, URL, DIV, H3, UL, LI, SPAN, redirect
request, T = current.request, current.T request, T = current.request, current.T
if args is None: args = [] if args is None: args = []
db = table._db db = table._db