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

fixed errors reporting in collection+json

Browse Source
This commit is contained in:
mdipierro
2014-07-02 18:35:25 -05:00
parent 55016cbd4d
commit 9a6f0b59ad
2 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.9.5-trunk+timestamp.2014.07.02.08.25.23 Version 2.9.5-trunk+timestamp.2014.07.02.18.33.22
gluon/contrib/hypermedia.py
+26 -11
View File
@@ -67,10 +67,18 @@ class Collection(object):
href = URL(args=field._tablename,vars={field.name:row.id},scheme=True) href = URL(args=field._tablename,vars={field.name:row.id},scheme=True)
else: else:
href = URL(args=field._tablename,scheme=True)+'?%s={id}' % field.name href = URL(args=field._tablename,scheme=True)+'?%s={id}' % field.name
links.append({'rel':str(field),'href':href,'prompt':str(field)}) links.append({'rel':'current','href':href,'prompt':str(field),
'type':'children'})
fields = self.table_policy.get('fields', table.fields)
for fieldname in fields:
field = table[fieldname]
if field.type=='upload' and row[fieldname]:
href = URL('download',args=row[fieldname],scheme=True)
links.append({'rel':'current','href':href,'prompt':str(field),
'type':'attachment'})
# should this be supported? # should this be supported?
for rel,build in (self.table_policy.get('links',{}).items()): for rel,build in (self.table_policy.get('links',{}).items()):
links.append({'rel':rel,'href':build(row),'prompt':rel}) links.append({'rel':'current','href':build(row),'prompt':rel})
# not sure # not sure
return links return links
@@ -257,9 +265,12 @@ class Collection(object):
try: try:
(query, limitby, orderby) = self.request2query(table, request.get_vars) (query, limitby, orderby) = self.request2query(table, request.get_vars)
fields = filter(lambda (fn,value):table[fn].writable,data.items()) fields = filter(lambda (fn,value):table[fn].writable,data.items())
n = db(query).update(**dict(fields)) # MAY FAIL res = db(query).validate_and_update(**dict(fields)) # MAY FAIL
response.status = 200 if res.errors:
return '' return self.error(400,'BAD REQUEST','Validation Error',res.errors)
else:
response.status = 200
return ''
except: except:
db.rollback() db.rollback()
return self.error(400,'BAD REQUEST','Invalid Query') return self.error(400,'BAD REQUEST','Invalid Query')
@@ -267,10 +278,14 @@ class Collection(object):
# ADD validate fields and return error # ADD validate fields and return error
try: try:
fields = filter(lambda (fn,value):table[fn].writable,data.items()) fields = filter(lambda (fn,value):table[fn].writable,data.items())
id = table.insert(**dict(fields)) # MAY FAIL res = table.validate_and_insert(**dict(fields)) # MAY FAIL
response.status = 201 if res.errors:
response.headers['location'] = URL(args=(tablename,id),scheme=True) return self.error(400,'BAD REQUEST','Validation Error',res.errors)
return '' else:
response.status = 201
response.headers['location'] = \
URL(args=(tablename,res.id),scheme=True)
return ''
except SyntaxError,e: #Exception,e: except SyntaxError,e: #Exception,e:
db.rollback() db.rollback()
return self.error(400,'BAD REQUEST','Invalid Query:'+e) return self.error(400,'BAD REQUEST','Invalid Query:'+e)
@@ -287,8 +302,8 @@ class Collection(object):
if self.extensions and form_errors: if self.extensions and form_errors:
# https://github.com/collection-json/extensions/blob/master/errors.md # https://github.com/collection-json/extensions/blob/master/errors.md
r['errors'] = errors = {} r['errors'] = errors = {}
for key, value in form_errors: for key, value in form_errors.items():
errors[key] = [{'title':'Validation Error','code':'','message':value}] errors[key] = {'title':'Validation Error','code':'','message':value}
response.headers['Content-Type'] = 'application/vnd.collection+json' response.headers['Content-Type'] = 'application/vnd.collection+json'
response.status = 400 response.status = 400
return response.json({'collection':r}) return response.json({'collection':r})