Revision e5966bd9 snf-astakos-app/astakos/im/models.py

b/snf-astakos-app/astakos/im/models.py
324 324
    def get_by_email(self, email):
325 325
        return self.get(email=email)
326 326

  
327
    def get_by_identifier(self, email_or_username, **kwargs):
328
        try:
329
            return self.get(email__iexact=email_or_username, **kwargs)
330
        except AstakosUser.DoesNotExist:
331
            return self.get(username__iexact=email_or_username, **kwargs)
332

  
333
    def user_exists(self, email_or_username, **kwargs):
334
        qemail = Q(email__iexact=email_or_username)
335
        qusername = Q(username__iexact=email_or_username)
336
        return self.filter(qemail | qusername).exists()
337

  
338

  
327 339
class AstakosUser(User):
328 340
    """
329 341
    Extends ``django.contrib.auth.models.User`` by defining additional fields.
......
501 513

  
502 514
        if not self.id:
503 515
            # set username
504
            self.username = self.email
516
            self.username = self.email.lower()
505 517

  
506 518
        self.validate_unique_email_isactive()
507 519

  

Also available in: Unified diff