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

for a grid in a component, cancel delete fails, issue 879, thanks simonm3

Browse Source
This commit is contained in:
mdipierro
2012-07-11 18:23:49 -05:00
parent 0032154bd9
commit e6bbdd3519
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@@ -1 +1 @@
Version 2.00.0 (2012-07-11 18:21:38) dev
Version 2.00.0 (2012-07-11 18:23:46) dev

6
gluon/html.py
View File

@@ -1357,10 +1357,12 @@ class A(DIV):
(self['component'],self['target'] or '',d)
self['_href'] = self['_href'] or '#null'
elif self['callback']:
returnfalse="var e = arguments[0] || window.event; e.cancelBubble=true; if (e.stopPropagation) e.stopPropagation();"
if d:
self['_onclick']="if(confirm(w2p_ajax_confirm_message||'Are you sure you want o delete this object?')){ajax('%s',[],'%s');%s};return false;" % (self['callback'],self['target'] or '',d)
self['_onclick']="if(confirm(w2p_ajax_confirm_message||'Are you sure you want o delete this object?')){ajax('%s',[],'%s');%s};%s" % \
(self['callback'],self['target'] or '',d, returnfalse)
else:
self['_onclick']="ajax('%s',[],'%s');%sreturn false;" % \
self['_onclick']="ajax('%s',[],'%s');%sreturn false" % \
(self['callback'],self['target'] or '',d)
self['_href'] = self['_href'] or '#null'
elif self['cid']: