FORM.dialog -> FORM.confirm

This commit is contained in:
mdipierro
2012-07-28 01:00:57 -05:00
parent 7650e6de95
commit 32847ed4f7
3 changed files with 7 additions and 6 deletions
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-07-28 00:56:00) dev
Version 2.00.0 (2012-07-28 01:00:54) dev
+4 -4
View File
@@ -317,7 +317,7 @@ def pack_plugin():
redirect(URL('plugin',args=request.args))
def upgrade_web2py():
dialog = FORM.dialog(T('Upgrade'),
dialog = FORM.confim(T('Upgrade'),
{T('Cancel'):URL('site')})
if dialog.accepted:
(success, error) = upgrade(request)
@@ -331,7 +331,7 @@ def upgrade_web2py():
def uninstall():
app = get_app()
dialog = FORM.dialog(T('Uninstall'),
dialog = FORM.confim(T('Uninstall'),
{T('Cancel'):URL('site')})
if dialog.accepted:
@@ -414,7 +414,7 @@ def delete():
if isinstance(sender, list): # ## fix a problem with Vista
sender = sender[0]
dialog = FORM.dialog(T('Delete'),
dialog = FORM.confim(T('Delete'),
{T('Cancel'):URL(sender, anchor=request.vars.id)})
if dialog.accepted:
@@ -981,7 +981,7 @@ def delete_plugin():
plugin = request.args(1)
plugin_name='plugin_'+plugin
dialog = FORM.dialog(
dialog = FORM.confim(
T('Delete'),
{T('Cancel'):URL('design', args=app)})
+2 -1
View File
@@ -2041,8 +2041,9 @@ class FORM(DIV):
_onclick=self.REDIRECT_JS % url))
@staticmethod
def dialog(text='OK',buttons=None,hidden=None):
def confim(text='OK',buttons=None,hidden=None):
if not buttons: buttons = {}
if not hidden: hidden={}
inputs = [INPUT(_type='button',