Revision fc3cca39

b/snf-astakos-app/astakos/im/management/commands/user_list.py
71 71 
        elif options['pending_send_mail']:
72 72 
            users = users.filter(is_active=False, activation_sent=None)
73 73
74 
        labels = ('id', 'email', 'real name', 'active', 'admin', 'provider', 'groups')
74 
        labels = ('id', 'email', 'real name', 'active', 'admin', 'provider')
75 75 
        columns = (3, 24, 24, 6, 5, 12, 24)
76 76
77 77 
        if not options['csv']:
......
84 84 
            id = str(user.id)
85 85 
            active = format_bool(user.is_active)
86 86 
            admin = format_bool(user.is_superuser)
87 
            fields = (id, user.email, user.realname, active, admin, user.provider,
88 
                      ','.join([g.name for g in user.astakos_groups.all()]))
87 
            fields = (id, user.email, user.realname, active, admin, user.provider)
89 88
90 89 
            if options['csv']:
91 90 
                line = '|'.join(fields)
b/snf-astakos-app/astakos/im/management/commands/user_show.py
74 74 
                'provider': user.provider,
75 75 
                'verified': format_bool(user.is_verified),
76 76 
                'has_credits': format_bool(user.has_credits),
77 
                'groups': [elem.name for elem in user.groups.all()],
77 
                'groups': [elem.name for elem in user.astakos_groups.all()],
78 78 
                'permissions': [elem.codename for elem in user.user_permissions.all()],
79 79 
                'group_permissions': user.get_group_permissions(),
80 80 
                'third_party_identifier': user.third_party_identifier,
81 81 
                'email_verified': format_bool(user.email_verified),
82 82 
                'username': user.username,
83 
                'activation_sent_date': format_date(user.activation_sent)
83 
                'activation_sent_date': format_date(user.activation_sent),
84 
                'resources' : user.quota
84 85 
            }
85 86 
            if get_latest_terms():
86 87 
                has_signed_terms = user.signed_terms()

Also available in: Unified diff