fixed some issue in grid with grid.create_form

This commit is contained in:
Massimo Di Pierro
2012-04-09 15:57:58 -05:00
parent 84b07ad923
commit b973db10ca
2 changed files with 7 additions and 15 deletions
+1 -1
View File
@@ -1 +1 @@
Version 1.99.7 (2012-04-09 09:21:21) dev Version 1.99.7 (2012-04-09 15:57:17) dev
+6 -14
View File
@@ -1614,7 +1614,7 @@ class SQLFORM(FORM):
formfooter = DIV( formfooter = DIV(
_class='form_footer row_buttons %(header)s %(cornerbottom)s' % ui) _class='form_footer row_buttons %(header)s %(cornerbottom)s' % ui)
create_form = edit_form = None create_form = update_form = view_form = None
sqlformargs = dict(formargs) sqlformargs = dict(formargs)
if create and len(request.args)>1 and request.args[-2] == 'new': if create and len(request.args)>1 and request.args[-2] == 'new':
@@ -1630,9 +1630,6 @@ class SQLFORM(FORM):
onvalidation=onvalidation, onvalidation=onvalidation,
onsuccess=oncreate) onsuccess=oncreate)
res = DIV(buttons(), create_form, formfooter, _class=_class) res = DIV(buttons(), create_form, formfooter, _class=_class)
res.create_form = create_form
res.edit_form = None
res.update_form = None
return res return res
elif details and len(request.args)>2 and request.args[-3]=='view': elif details and len(request.args)>2 and request.args[-3]=='view':
check_authorization() check_authorization()
@@ -1644,30 +1641,24 @@ class SQLFORM(FORM):
**sqlformargs) **sqlformargs)
res = DIV(buttons(edit=editable, record=record), view_form, res = DIV(buttons(edit=editable, record=record), view_form,
formfooter, _class=_class) formfooter, _class=_class)
res.create_form = None
res.edit_form = None
res.update_form = None
return res return res
elif editable and len(request.args)>2 and request.args[-3]=='edit': elif editable and len(request.args)>2 and request.args[-3]=='edit':
check_authorization() check_authorization()
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)
edit_form = SQLFORM(table, record, upload=upload, ignore_rw=ignore_rw, update_form = SQLFORM(table, 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'),
**sqlformargs) **sqlformargs)
edit_form.process(formname=formname, update_form.process(formname=formname,
onvalidation=onvalidation, onvalidation=onvalidation,
onsuccess=onupdate, onsuccess=onupdate,
next=referrer) next=referrer)
res = DIV(buttons(view=details, record=record), res = DIV(buttons(view=details, record=record),
edit_form, formfooter, _class=_class) update_form, formfooter, _class=_class)
res.create_form = None
res.edit_form = edit_form
res.update_form = None
return res return res
elif deletable and len(request.args)>2 and request.args[-3]=='delete': elif deletable and len(request.args)>2 and request.args[-3]=='delete':
check_authorization() check_authorization()
@@ -1934,7 +1925,8 @@ class SQLFORM(FORM):
"web2py_paginator %(header)s %(cornerbottom)s" % ui), "web2py_paginator %(header)s %(cornerbottom)s" % ui),
_class='%s %s' % (_class, ui.get('widget',''))) _class='%s %s' % (_class, ui.get('widget','')))
res.create_form = create_form res.create_form = create_form
res.edit_form = edit_form res.update_form = update_form
res.view_form = view_form
res.search_form = search_form res.search_form = search_form
return res return res