From 318e8046baa300063c2e893244a6ef873398c97e Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Sat, 22 Jun 2013 01:34:19 -0500
Subject: [PATCH] appadmin now works with lazy tables, thanks Anthony

---
 VERSION                                       |  2 +-
 applications/admin/controllers/appadmin.py    | 34 +++++++++----------
 applications/examples/controllers/appadmin.py | 34 +++++++++----------
 applications/welcome/controllers/appadmin.py  | 34 +++++++++----------
 4 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/VERSION b/VERSION
index d6ff3003..d97139ad 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.5.1-stable+timestamp.2013.06.21.10.15.15
+Version 2.5.1-stable+timestamp.2013.06.22.01.33.30
diff --git a/applications/admin/controllers/appadmin.py b/applications/admin/controllers/appadmin.py
index 0a1df73f..b80301ae 100644
--- a/applications/admin/controllers/appadmin.py
+++ b/applications/admin/controllers/appadmin.py
@@ -42,9 +42,9 @@ if request.function == 'manage':
     if manager_action is None and request.args(0) == 'auth':
         manager_action = dict(role=auth.settings.auth_manager_role,
                               heading=T('Manage Access Control'),
-                              tables=[auth.settings.table_user,
-                                      auth.settings.table_group,
-                                      auth.settings.table_permission])
+                              tables=[auth.table_user(),
+                                      auth.table_group(),
+                                      auth.table_permission()])
     manager_role = manager_action.get('role', None) if manager_action else None
     auth.requires_membership(manager_role)(lambda: None)()
     menu = False
@@ -596,10 +596,10 @@ def manage():
         db = globals()[db] if isinstance(db, str) else db
         tables = [db[table] for table in tables]
     if request.args(0) == 'auth':
-        auth.settings.table_user._plural = T('Users')
-        auth.settings.table_group._plural = T('Roles')
-        auth.settings.table_membership._plural = T('Memberships')
-        auth.settings.table_permission._plural = T('Permissions')
+        auth.table_user()._plural = T('Users')
+        auth.table_group()._plural = T('Roles')
+        auth.table_membership()._plural = T('Memberships')
+        auth.table_permission()._plural = T('Permissions')
     if request.extension != 'load':
         return dict(heading=manager_action.get('heading',
                     T('Manage %(action)s') % dict(action=request.args(0).replace('_', ' ').title())),
@@ -610,18 +610,18 @@ def manage():
     formname = '%s_grid' % table._tablename
     linked_tables = orderby = None
     if request.args(0) == 'auth':
-        auth.settings.table_group._id.readable = \
-        auth.settings.table_membership._id.readable = \
-        auth.settings.table_permission._id.readable = False
-        auth.settings.table_membership.user_id.label = T('User')
-        auth.settings.table_membership.group_id.label = T('Role')
-        auth.settings.table_permission.group_id.label = T('Role')
-        auth.settings.table_permission.name.label = T('Permission')
-        if table == auth.settings.table_user:
+        auth.table_group()._id.readable = \
+        auth.table_membership()._id.readable = \
+        auth.table_permission()._id.readable = False
+        auth.table_membership().user_id.label = T('User')
+        auth.table_membership().group_id.label = T('Role')
+        auth.table_permission().group_id.label = T('Role')
+        auth.table_permission().name.label = T('Permission')
+        if table == auth.table_user():
             linked_tables=[auth.settings.table_membership_name]
-        elif table == auth.settings.table_group:
+        elif table == auth.table_group():
             orderby = 'role' if not request.args(3) or '.group_id' not in request.args(3) else None
-        elif table == auth.settings.table_permission:
+        elif table == auth.table_permission():
             orderby = 'group_id'
     grid = SQLFORM.smartgrid(table, args=request.args[:2], user_signature=True,
                              orderby=orderby, linked_tables=linked_tables,
diff --git a/applications/examples/controllers/appadmin.py b/applications/examples/controllers/appadmin.py
index 0a1df73f..b80301ae 100644
--- a/applications/examples/controllers/appadmin.py
+++ b/applications/examples/controllers/appadmin.py
@@ -42,9 +42,9 @@ if request.function == 'manage':
     if manager_action is None and request.args(0) == 'auth':
         manager_action = dict(role=auth.settings.auth_manager_role,
                               heading=T('Manage Access Control'),
-                              tables=[auth.settings.table_user,
-                                      auth.settings.table_group,
-                                      auth.settings.table_permission])
+                              tables=[auth.table_user(),
+                                      auth.table_group(),
+                                      auth.table_permission()])
     manager_role = manager_action.get('role', None) if manager_action else None
     auth.requires_membership(manager_role)(lambda: None)()
     menu = False
@@ -596,10 +596,10 @@ def manage():
         db = globals()[db] if isinstance(db, str) else db
         tables = [db[table] for table in tables]
     if request.args(0) == 'auth':
-        auth.settings.table_user._plural = T('Users')
-        auth.settings.table_group._plural = T('Roles')
-        auth.settings.table_membership._plural = T('Memberships')
-        auth.settings.table_permission._plural = T('Permissions')
+        auth.table_user()._plural = T('Users')
+        auth.table_group()._plural = T('Roles')
+        auth.table_membership()._plural = T('Memberships')
+        auth.table_permission()._plural = T('Permissions')
     if request.extension != 'load':
         return dict(heading=manager_action.get('heading',
                     T('Manage %(action)s') % dict(action=request.args(0).replace('_', ' ').title())),
@@ -610,18 +610,18 @@ def manage():
     formname = '%s_grid' % table._tablename
     linked_tables = orderby = None
     if request.args(0) == 'auth':
-        auth.settings.table_group._id.readable = \
-        auth.settings.table_membership._id.readable = \
-        auth.settings.table_permission._id.readable = False
-        auth.settings.table_membership.user_id.label = T('User')
-        auth.settings.table_membership.group_id.label = T('Role')
-        auth.settings.table_permission.group_id.label = T('Role')
-        auth.settings.table_permission.name.label = T('Permission')
-        if table == auth.settings.table_user:
+        auth.table_group()._id.readable = \
+        auth.table_membership()._id.readable = \
+        auth.table_permission()._id.readable = False
+        auth.table_membership().user_id.label = T('User')
+        auth.table_membership().group_id.label = T('Role')
+        auth.table_permission().group_id.label = T('Role')
+        auth.table_permission().name.label = T('Permission')
+        if table == auth.table_user():
             linked_tables=[auth.settings.table_membership_name]
-        elif table == auth.settings.table_group:
+        elif table == auth.table_group():
             orderby = 'role' if not request.args(3) or '.group_id' not in request.args(3) else None
-        elif table == auth.settings.table_permission:
+        elif table == auth.table_permission():
             orderby = 'group_id'
     grid = SQLFORM.smartgrid(table, args=request.args[:2], user_signature=True,
                              orderby=orderby, linked_tables=linked_tables,
diff --git a/applications/welcome/controllers/appadmin.py b/applications/welcome/controllers/appadmin.py
index 0a1df73f..b80301ae 100644
--- a/applications/welcome/controllers/appadmin.py
+++ b/applications/welcome/controllers/appadmin.py
@@ -42,9 +42,9 @@ if request.function == 'manage':
     if manager_action is None and request.args(0) == 'auth':
         manager_action = dict(role=auth.settings.auth_manager_role,
                               heading=T('Manage Access Control'),
-                              tables=[auth.settings.table_user,
-                                      auth.settings.table_group,
-                                      auth.settings.table_permission])
+                              tables=[auth.table_user(),
+                                      auth.table_group(),
+                                      auth.table_permission()])
     manager_role = manager_action.get('role', None) if manager_action else None
     auth.requires_membership(manager_role)(lambda: None)()
     menu = False
@@ -596,10 +596,10 @@ def manage():
         db = globals()[db] if isinstance(db, str) else db
         tables = [db[table] for table in tables]
     if request.args(0) == 'auth':
-        auth.settings.table_user._plural = T('Users')
-        auth.settings.table_group._plural = T('Roles')
-        auth.settings.table_membership._plural = T('Memberships')
-        auth.settings.table_permission._plural = T('Permissions')
+        auth.table_user()._plural = T('Users')
+        auth.table_group()._plural = T('Roles')
+        auth.table_membership()._plural = T('Memberships')
+        auth.table_permission()._plural = T('Permissions')
     if request.extension != 'load':
         return dict(heading=manager_action.get('heading',
                     T('Manage %(action)s') % dict(action=request.args(0).replace('_', ' ').title())),
@@ -610,18 +610,18 @@ def manage():
     formname = '%s_grid' % table._tablename
     linked_tables = orderby = None
     if request.args(0) == 'auth':
-        auth.settings.table_group._id.readable = \
-        auth.settings.table_membership._id.readable = \
-        auth.settings.table_permission._id.readable = False
-        auth.settings.table_membership.user_id.label = T('User')
-        auth.settings.table_membership.group_id.label = T('Role')
-        auth.settings.table_permission.group_id.label = T('Role')
-        auth.settings.table_permission.name.label = T('Permission')
-        if table == auth.settings.table_user:
+        auth.table_group()._id.readable = \
+        auth.table_membership()._id.readable = \
+        auth.table_permission()._id.readable = False
+        auth.table_membership().user_id.label = T('User')
+        auth.table_membership().group_id.label = T('Role')
+        auth.table_permission().group_id.label = T('Role')
+        auth.table_permission().name.label = T('Permission')
+        if table == auth.table_user():
             linked_tables=[auth.settings.table_membership_name]
-        elif table == auth.settings.table_group:
+        elif table == auth.table_group():
             orderby = 'role' if not request.args(3) or '.group_id' not in request.args(3) else None
-        elif table == auth.settings.table_permission:
+        elif table == auth.table_permission():
             orderby = 'group_id'
     grid = SQLFORM.smartgrid(table, args=request.args[:2], user_signature=True,
                              orderby=orderby, linked_tables=linked_tables,