From b142fa9f7e1e2881a8c965c65a4fad3caa7c1864 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 5 Oct 2012 09:01:51 -0500 Subject: [PATCH] lazy tables re-appeared in appadmin --- VERSION | 2 +- applications/admin/controllers/appadmin.py | 1 - applications/admin/views/appadmin.html | 6 +++--- applications/examples/controllers/appadmin.py | 1 - applications/examples/views/appadmin.html | 6 +++--- applications/welcome/controllers/appadmin.py | 1 - applications/welcome/views/appadmin.html | 6 +++--- gluon/dal.py | 3 ++- 8 files changed, 12 insertions(+), 14 deletions(-) diff --git a/VERSION b/VERSION index 3fb7004b..ef7830dd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.0.9 (2012-10-05 07:25:17) dev +Version 2.0.9 (2012-10-05 09:01:45) dev diff --git a/applications/admin/controllers/appadmin.py b/applications/admin/controllers/appadmin.py index b37afc70..c25fed29 100644 --- a/applications/admin/controllers/appadmin.py +++ b/applications/admin/controllers/appadmin.py @@ -113,7 +113,6 @@ def query_by_table_type(tablename,db,request=request): # ## list all databases and tables # ########################################################### - def index(): return dict(databases=databases) diff --git a/applications/admin/views/appadmin.html b/applications/admin/views/appadmin.html index 6a933679..f966b79c 100644 --- a/applications/admin/views/appadmin.html +++ b/applications/admin/views/appadmin.html @@ -27,7 +27,7 @@ {{pass}} {{else:}} {{qry=''}} - {{pass}} + {{pass}} {{pass}} @@ -37,9 +37,9 @@ {{=A(str(T('New Record')),_href=URL('insert',args=[db,table]),_class="btn")}} - {{pass}} - {{pass}} + {{pass}} + {{elif request.function=='select':}}

{{=XML(str(T("Database %s select"))%A(request.args[0],_href=URL('index'))) }} diff --git a/applications/examples/controllers/appadmin.py b/applications/examples/controllers/appadmin.py index b37afc70..c25fed29 100644 --- a/applications/examples/controllers/appadmin.py +++ b/applications/examples/controllers/appadmin.py @@ -113,7 +113,6 @@ def query_by_table_type(tablename,db,request=request): # ## list all databases and tables # ########################################################### - def index(): return dict(databases=databases) diff --git a/applications/examples/views/appadmin.html b/applications/examples/views/appadmin.html index 6a933679..f966b79c 100644 --- a/applications/examples/views/appadmin.html +++ b/applications/examples/views/appadmin.html @@ -27,7 +27,7 @@ {{pass}} {{else:}} {{qry=''}} - {{pass}} + {{pass}} {{pass}} @@ -37,9 +37,9 @@ {{=A(str(T('New Record')),_href=URL('insert',args=[db,table]),_class="btn")}} - {{pass}} - {{pass}} + {{pass}} + {{elif request.function=='select':}}

{{=XML(str(T("Database %s select"))%A(request.args[0],_href=URL('index'))) }} diff --git a/applications/welcome/controllers/appadmin.py b/applications/welcome/controllers/appadmin.py index b37afc70..c25fed29 100644 --- a/applications/welcome/controllers/appadmin.py +++ b/applications/welcome/controllers/appadmin.py @@ -113,7 +113,6 @@ def query_by_table_type(tablename,db,request=request): # ## list all databases and tables # ########################################################### - def index(): return dict(databases=databases) diff --git a/applications/welcome/views/appadmin.html b/applications/welcome/views/appadmin.html index 6a933679..f966b79c 100644 --- a/applications/welcome/views/appadmin.html +++ b/applications/welcome/views/appadmin.html @@ -27,7 +27,7 @@ {{pass}} {{else:}} {{qry=''}} - {{pass}} + {{pass}} {{pass}} @@ -37,9 +37,9 @@ {{=A(str(T('New Record')),_href=URL('insert',args=[db,table]),_class="btn")}} - {{pass}} - {{pass}} + {{pass}} + {{elif request.function=='select':}}

{{=XML(str(T("Database %s select"))%A(request.args[0],_href=URL('index'))) }} diff --git a/gluon/dal.py b/gluon/dal.py index b8ad25d8..1479de68 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -7052,7 +7052,8 @@ def index(): table = None else: table = self.lazy_define_table(tablename,*fields,**args) - if not tablename in self.tables: self.tables.append(tablename) + if not tablename in self.tables: + self.tables.append(tablename) return table def lazy_define_table(