app/soc/logic/models/user.py
changeset 1242 c5ca70606850
parent 1193 8d3a7e8d88bd
child 1307 091a21cf3627
equal deleted inserted replaced
1241:5e25cd6abe09 1242:c5ca70606850
    52     #   number of queries
    52     #   number of queries
    53     users_with_former_accounts = soc.models.user.User.gql(
    53     users_with_former_accounts = soc.models.user.User.gql(
    54         'WHERE former_accounts != :1', None).fetch(1000)
    54         'WHERE former_accounts != :1', None).fetch(1000)
    55 
    55 
    56     for former_account_user in users_with_former_accounts: 
    56     for former_account_user in users_with_former_accounts: 
    57       if account in former_account_user.former_accounts:
    57       for former_account in former_account_user.former_accounts:
    58         return True
    58         if str(account) == str(former_account):
       
    59           return True
    59 
    60 
    60     return False
    61     return False
    61 
    62 
    62   def getForCurrentAccount(self):
    63   def getForCurrentAccount(self):
    63     """Retrieves the user entity for the currently logged in account.
    64     """Retrieves the user entity for the currently logged in account.
   151       sidebar.flush(entity.account)
   152       sidebar.flush(entity.account)
   152 
   153 
   153     if (name == 'agreed_to_tos') and (entity.agreed_to_tos != value):
   154     if (name == 'agreed_to_tos') and (entity.agreed_to_tos != value):
   154       sidebar.flush(entity.account)
   155       sidebar.flush(entity.account)
   155 
   156 
   156     if (name == 'account') and (entity.account != value):
   157     if (name == 'account') and (str(entity.account) != str(value)):
   157       entity.former_accounts.append(entity.account)
   158       entity.former_accounts.append(entity.account)
   158 
   159 
   159     return True
   160     return True
   160   
   161   
   161   def _onCreate(self, entity):
   162   def _onCreate(self, entity):