--- a/app/soc/logic/models/user.py Tue Mar 03 03:37:16 2009 +0000
+++ b/app/soc/logic/models/user.py Tue Mar 03 19:27:55 2009 +0000
@@ -68,7 +68,7 @@
entity, None is returned.
"""
- account = users.get_current_user()
+ account = accounts.getCurrentAccount()
if not account:
return None
@@ -102,9 +102,11 @@
user: if not specified, defaults to the current user
"""
+ current = accounts.getCurrentAccount()
+
if not account:
# default account to the current logged in account
- account = users.get_current_user()
+ account = current
if account and (not user):
# default user to the current logged in user
@@ -113,7 +115,7 @@
if user and user.is_developer:
return True
- if account and (account == users.get_current_user()):
+ if account and (account == current):
return users.is_current_user_admin()
def agreesToSiteToS(self, entity):