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

fixed issue 1459

Browse Source
This commit is contained in:
niphlod
2013-04-23 23:04:12 +02:00
parent b00463bdf4
commit 04f6e7ee38
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/sqlhtml.py
+12 -4
View File
@@ -2012,10 +2012,11 @@ class SQLFORM(FORM):
table = db[request.args[-2]] table = db[request.args[-2]]
record = table(request.args[-1]) or redirect(URL('error')) record = table(request.args[-1]) or redirect(URL('error'))
sqlformargs.update(editargs) sqlformargs.update(editargs)
deletable_ = deletable(record) if callable(deletable) else deletable
update_form = SQLFORM( update_form = SQLFORM(
table, table,
record, upload=upload, ignore_rw=ignore_rw, record, upload=upload, ignore_rw=ignore_rw,
formstyle=formstyle, deletable=deletable, formstyle=formstyle, deletable=deletable_,
_class='web2py_form', _class='web2py_form',
submit_button=T('Submit'), submit_button=T('Submit'),
delete_label=T('Check to delete'), delete_label=T('Check to delete'),
@@ -2035,9 +2036,16 @@ class SQLFORM(FORM):
return res return res
elif deletable and request.args(-3) == 'delete': elif deletable and request.args(-3) == 'delete':
table = db[request.args[-2]] table = db[request.args[-2]]
if ondelete: if not callable(deletable):
ondelete(table, request.args[-1]) if ondelete:
db(table[table._id.name] == request.args[-1]).delete() ondelete(table, request.args[-1])
db(table[table._id.name] == request.args[-1]).delete()
else:
record = table(request.args[-1]) or redirect(URL('error'))
if deletable(record):
if ondelete:
ondelete(table, request.args[-1])
record.delete_record()
redirect(referrer) redirect(referrer)
exportManager = dict( exportManager = dict(