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

mygroups -> user_groups, thanks Bruno

Browse Source
This commit is contained in:
Massimo Di Pierro
2012-01-29 23:26:59 -06:00
parent 3ba5e45203
commit eb259bd8be
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 1.99.4 (2012-01-29 16:24:43) stable Version 1.99.4 (2012-01-29 23:26:39) stable
gluon/tools.py
+3 -3
View File
@@ -872,7 +872,7 @@ class Auth(object):
request = current.request request = current.request
session = current.session session = current.session
auth = session.auth auth = session.auth
self.mygroups = auth and auth.mygroups or {} self.user_groups = auth and auth.user_groups or {}
if auth and auth.last_visit and auth.last_visit + \ if auth and auth.last_visit and auth.last_visit + \
datetime.timedelta(days=0, seconds=auth.expiration) > request.now: datetime.timedelta(days=0, seconds=auth.expiration) > request.now:
self.user = auth.user self.user = auth.user
@@ -2493,13 +2493,13 @@ class Auth(object):
def update_groups(self): def update_groups(self):
if not self.user: if not self.user:
return return
mygroups = self.mygroups = current.session.auth.mygroups = {} user_groups = self.user_groups = current.session.auth.user_groups = {}
memberships = self.db(self.settings.table_membership.user_id memberships = self.db(self.settings.table_membership.user_id
== self.user.id).select() == self.user.id).select()
for membership in memberships: for membership in memberships:
group = self.settings.table_group(membership.group_id) group = self.settings.table_group(membership.group_id)
if group: if group:
mygroups[membership.group_id] = group.role user_groups[membership.group_id] = group.role
def groups(self): def groups(self):
""" """