Revision 4bdd7e3d snf-astakos-app/astakos/im/models.py

b/snf-astakos-app/astakos/im/models.py
504 504
            self.username = self.email
505 505

  
506 506
        self.validate_unique_email_isactive()
507
        if self.is_active and self.activation_sent:
508
            # reset the activation sent
509
            self.activation_sent = None
510 507

  
511 508
        super(AstakosUser, self).save(**kwargs)
512 509

  
......
556 553
        """
557 554
        q = AstakosUser.objects.all()
558 555
        q = q.filter(email = self.email)
559
        q = q.filter(is_active = self.is_active)
560 556
        if self.id:
561 557
            q = q.filter(~Q(id = self.id))
562 558
        if q.count() != 0:

Also available in: Unified diff