dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed self.settings.table_<>

Browse Source
This commit is contained in:
mdipierro
2013-10-03 08:19:34 -05:00
parent 21a11ec47a
commit 302a985aa7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -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
gluon/tools.py
+3 -3
View File
@@ -1978,7 +1978,7 @@ class Auth(object):
""" """
from gluon.settings import global_settings from gluon.settings import global_settings
if global_settings.web2py_runtime_gae: 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') delattr(user,'password')
else: else:
user = Row(user) user = Row(user)
@@ -3127,7 +3127,7 @@ class Auth(object):
user_id = current.request.post_vars.user_id user_id = current.request.post_vars.user_id
if user_id and user_id != self.user.id and user_id != '0': if user_id and user_id != self.user.id and user_id != '0':
if not self.has_permission('impersonate', if not self.has_permission('impersonate',
self.settings.table_user_name, self.table_user(),
user_id): user_id):
raise HTTP(403, "Forbidden") raise HTTP(403, "Forbidden")
user = table_user(user_id) user = table_user(user_id)
@@ -3180,7 +3180,7 @@ class Auth(object):
table_membership.user_id == self.user.id).select() table_membership.user_id == self.user.id).select()
table = TABLE() table = TABLE()
for membership in memberships: 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() groups = self.db(table_group.id == membership.group_id).select()
if groups: if groups:
group = groups[0] group = groups[0]