From 51fe7b4eeda8052f76b44bd7270a00ed836c91c3 Mon Sep 17 00:00:00 2001 From: Massimo Di Pierro Date: Sat, 7 Apr 2012 18:44:46 -0500 Subject: [PATCH] smartdictform again --- VERSION | 2 +- gluon/sqlhtml.py | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index 53eeb91d..2f25fa13 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 1.99.7 (2012-04-07 18:31:34) dev +Version 1.99.7 (2012-04-07 18:44:26) dev diff --git a/gluon/sqlhtml.py b/gluon/sqlhtml.py index b67c5804..86a7f5b7 100644 --- a/gluon/sqlhtml.py +++ b/gluon/sqlhtml.py @@ -1317,12 +1317,11 @@ class SQLFORM(FORM): @staticmethod def smartdictform(session,name,filename=None,query=None,**kwargs): import os - if not name in session: - if query: - session[name] = db(query).select().first().as_dict() - elif os.path.exists(filename): - env = {'datetime':datetime} - session[name] = eval(open(filename).read(),{},env) + if query: + session[name] = db(query).select().first().as_dict() + elif os.path.exists(filename): + env = {'datetime':datetime} + session[name] = eval(open(filename).read(),{},env) form = SQLFORM.dictform(session[name]) if form.process().accepted: session[name].update(form.vars)