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

better parse as rest, thanks Denes

Browse Source
This commit is contained in:
mdipierro
2013-02-07 05:37:14 -06:00
parent f90dbb9321
commit 343f295b6b
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.4.1-alpha.2+timestamp.2013.02.06.17.21.25 Version 2.4.1-alpha.2+timestamp.2013.02.07.05.36.19
gluon/dal.py
+9 -4
View File
@@ -7394,10 +7394,12 @@ def index():
return Row({'status':200,'pattern':'list', return Row({'status':200,'pattern':'list',
'error':None,'response':patterns}) 'error':None,'response':patterns})
for pattern in patterns: for pattern in patterns:
basequery, exposedfields = None, []
if isinstance(pattern,tuple): if isinstance(pattern,tuple):
pattern, basequery = pattern if len(pattern)==2:
else: pattern, basequery = pattern
basequery = None elif len(pattern)>2:
pattern, basequery, exposedfields = pattern[0:3]
otable=table=None otable=table=None
if not isinstance(queries,dict): if not isinstance(queries,dict):
dbset=db(queries) dbset=db(queries)
@@ -7510,7 +7512,10 @@ def index():
orderby = [db[table][f] if not f.startswith('~') else ~db[table][f[1:]] for f in ofields] orderby = [db[table][f] if not f.startswith('~') else ~db[table][f[1:]] for f in ofields]
except (KeyError, AttributeError): except (KeyError, AttributeError):
return Row({'status':400,'error':'invalid orderby','response':None}) return Row({'status':400,'error':'invalid orderby','response':None})
fields = [field for field in db[table] if field.readable] if exposedfields:
fields = [field for field in db[table] if str(field).split('.')[-1] in exposedfields and field.readable]
else:
fields = [field for field in db[table] if field.readable]
count = dbset.count() count = dbset.count()
try: try:
offset = int(vars.get('offset',None) or 0) offset = int(vars.get('offset',None) or 0)