From 302a985aa76da3c5440fcb0cd643f962d34cb0f0 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Thu, 3 Oct 2013 08:19:34 -0500 Subject: [PATCH] fixed self.settings.table_<> --- VERSION | 2 +- gluon/tools.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index 1f9d31ac..027314ed 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.4-stable+timestamp.2013.10.02.18.43.22 +Version 2.6.4-stable+timestamp.2013.10.03.08.18.43 diff --git a/gluon/tools.py b/gluon/tools.py index fab30050..173cbd10 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -1978,7 +1978,7 @@ class Auth(object): """ from gluon.settings import global_settings if global_settings.web2py_runtime_gae: - user = Row(self.settings.table_user._filter_fields(user, id=True)) + user = Row(self.table_user()._filter_fields(user, id=True)) delattr(user,'password') else: user = Row(user) @@ -3127,7 +3127,7 @@ class Auth(object): user_id = current.request.post_vars.user_id if user_id and user_id != self.user.id and user_id != '0': if not self.has_permission('impersonate', - self.settings.table_user_name, + self.table_user(), user_id): raise HTTP(403, "Forbidden") user = table_user(user_id) @@ -3180,7 +3180,7 @@ class Auth(object): table_membership.user_id == self.user.id).select() table = TABLE() for membership in memberships: - table_group = self.db[self.settings.table_group_name] + table_group = self.table_group() groups = self.db(table_group.id == membership.group_id).select() if groups: group = groups[0]