Revision 397d5cbe astakos/im/management/commands/activateuser.py

b/astakos/im/management/commands/activateuser.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
from optparse import make_option
35

  
36 34
from django.core.management.base import BaseCommand, CommandError
37 35

  
38 36
from astakos.im.admin.functions import activate
39
from astakos.im.models import AstakosUser
37

  
38
from ._common import get_user
40 39
    
41 40

  
42 41
class Command(BaseCommand):
......
48 47
            raise CommandError("No user was given")
49 48
        
50 49
        for email_or_id in args:
51
            try:
52
                if email_or_id.isdigit():
53
                    user = AstakosUser.objects.get(id=int(email_or_id))
54
                else:
55
                    user = AstakosUser.objects.get(email=email_or_id)
56
            except AstakosUser.DoesNotExist:
57
                field = 'id' if email_or_id.isdigit() else 'email'
58
                msg = "Unknown user with %s '%s'" % (field, email_or_id)
59
                self.stderr.write(msg + '\n')
50
            user = get_user(email_or_id)
51
            if not user:
52
                self.stderr.write("Unknown user '%s'\n" % (email_or_id,))
60 53
                continue
61 54
            
62 55
            if user.is_active:

Also available in: Unified diff