From ce968db278ce509ebcae466eb6d973589d0f2e59 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Mon, 27 Aug 2012 14:07:25 -0500
Subject: [PATCH] toolbar() shows non-lazy tables, thanks Anthony

---
 VERSION                                 |  2 +-
 applications/admin/languages/default.py | 34 +++++++++++++++++++++++++
 gluon/globals.py                        |  4 +++
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index c9eaf349..c7378efc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-08-27 13:30:38) dev
+Version 2.00.0 (2012-08-27 14:07:20) dev
diff --git a/applications/admin/languages/default.py b/applications/admin/languages/default.py
index 94b0828c..e764c539 100644
--- a/applications/admin/languages/default.py
+++ b/applications/admin/languages/default.py
@@ -4,5 +4,39 @@
 '!langname!': 'English (US)',
 '%Y-%m-%d': '%m-%d-%Y',
 '%Y-%m-%d %H:%M:%S': '%m-%d-%Y %H:%M:%S',
+'About': 'About',
+'Admin language': 'Admin language',
+'administrative interface': 'administrative interface',
+'Administrator Password:': 'Administrator Password:',
+'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',
+'arguments': 'arguments',
 'back': '<<back',
+'code': 'code',
+'created by': 'created by',
+'Debug': 'Debug',
+'Detailed traceback description': 'Detailed traceback description',
+'direction: ltr': 'direction: ltr',
+'Edit': 'Edit',
+'Error snapshot': 'Error snapshot',
+'Error ticket': 'Error ticket',
+'Errors': 'Errors',
+'Exception instance attributes': 'Exception instance attributes',
+'Frames': 'Frames',
+'Help': 'Help',
+'inspect attributes': 'inspect attributes',
+'locals': 'locals',
+'Login': 'Login',
+'Login to the Administrative Interface': 'Login to the Administrative Interface',
+'Logout': 'Logout',
+'Powered by': 'Powered by',
+'request': 'request',
+'response': 'response',
+'session': 'session',
+'Site': 'Site',
+'Ticket ID': 'Ticket ID',
+'Traceback': 'Traceback',
+'variables': 'variables',
+'Version': 'Version',
+'Versioning': 'Versioning',
+'Web Framework': 'Web Framework',
 }
diff --git a/gluon/globals.py b/gluon/globals.py
index ab6ec9ad..10c9a912 100644
--- a/gluon/globals.py
+++ b/gluon/globals.py
@@ -405,6 +405,8 @@ class Response(Storage):
             dbstats = [TABLE(*[TR(PRE(row[0]),'%.2fms' % (row[1]*1000)) \
                                    for row in i.db._timings]) \
                            for i in thread.instances]
+            dbtables = dict([(i.uri, [t for t in i.db.tables if t not in i.db._LAZY_TABLES])
+                             for i in thread.instances])
         else:
             dbstats = [] # if no db or on GAE
         u = web2py_uuid()
@@ -416,6 +418,8 @@ class Response(Storage):
             DIV(BEAUTIFY(current.session),_class="hidden",_id="session-%s"%u),
             BUTTON('response',_onclick="jQuery('#response-%s').slideToggle()"%u),
             DIV(BEAUTIFY(current.response),_class="hidden",_id="response-%s"%u),
+            BUTTON('db tables',_onclick="jQuery('#db-tables-%s').slideToggle()"%u),
+            DIV(BEAUTIFY(dbtables),_class="hidden",_id="db-tables-%s"%u),
             BUTTON('db stats',_onclick="jQuery('#db-stats-%s').slideToggle()"%u),
             DIV(BEAUTIFY(dbstats),_class="hidden",_id="db-stats-%s"%u),
             SCRIPT("jQuery('.hidden').hide()")