Revision cb261eef

b/snf-astakos-app/astakos/im/management/commands/invitation-details.py
35 35

  
36 36
from astakos.im.models import Invitation
37 37

  
38
from ._common import format_bool, format_date
38
from ._common import format
39 39

  
40 40

  
41 41
class Command(BaseCommand):
......
56 56
            'real name': invitation.realname,
57 57
            'email': invitation.username,
58 58
            'code': invitation.code,
59
            'consumed': format_bool(invitation.is_consumed),
60
            'date created': format_date(invitation.created),
61
            'date consumed': format_date(invitation.consumed),
59
            'consumed': invitation.is_consumed,
60
            'date created': invitation.created,
61
            'date consumed': invitation.consumed,
62 62
            'inviter real name': invitation.inviter.realname,
63 63
            'invitater email': invitation.inviter.email,
64 64
        }
65 65

  
66 66
        for key, val in sorted(kv.items()):
67
            line = '%s: %s\n' % (key.rjust(18), val)
67
            line = '%s: %s\n' % (key.rjust(18), format(val))
68 68
            self.stdout.write(line)
b/snf-astakos-app/astakos/im/management/commands/invitation-list.py
67 67
            id = str(invitation.id)
68 68
            code = str(invitation.code)
69 69
            consumed = format_bool(invitation.is_consumed)
70
            fields = (
71
                id, invitation.inviter.email, invitation.username, invitation.realname,
72
                code, consumed)
70
            fields = (format(elem) for elem in \
71
                        (id, invitation.inviter.email, invitation.username,
72
                         invitation.realname, code, consumed))
73 73

  
74 74
            if options['csv']:
75 75
                line = '|'.join(fields)
b/snf-astakos-app/astakos/im/management/commands/project-list.py
36 36
from django.core.management.base import NoArgsCommand
37 37

  
38 38
from astakos.im.models import Chain
39
from ._common import format_bool, shortened
39
from ._common import format, shortened
40 40

  
41 41

  
42 42
class Command(NoArgsCommand):
......
71 71

  
72 72
        for info in chain_info(chain_dict):
73 73

  
74
            fields = [
74
            fields = [(format(elem) for elem in (
75 75
                (info['projectid'], False),
76 76
                (info['name'], True),
77 77
                (info['owner'], True),
78 78
                (info['status'], False),
79 79
                (info['appid'], False),
80
            ]
80
            )]
81 81

  
82 82
            if options['csv']:
83 83
                line = '|'.join(fields)
b/snf-astakos-app/astakos/im/management/commands/project-show.py
37 37
from synnefo.lib.ordereddict import OrderedDict
38 38
from astakos.im.models import Chain, ProjectApplication
39 39

  
40
from ._common import format_bool, format_date
40
from ._common import format
41 41

  
42 42

  
43 43
class Command(BaseCommand):
......
86 86

  
87 87
    def show_info(self, info):
88 88
        for key, val in info.items():
89
            line = '%s: %s\n' % (key.rjust(22), val)
89
            line = '%s: %s\n' % (key.rjust(22), format(val))
90 90
            self.stdout.write(line)
91 91
        self.stdout.write('\n')
92 92

  
......
140 140
            ('homepage', app.homepage),
141 141
            ('description', app.description),
142 142
            ('comments for review', app.comments),
143
            ('request issue date', format_date(app.issue_date)),
144
            ('request start date', format_date(app.start_date)),
145
            ('request end date', format_date(app.end_date)),
143
            ('request issue date', app.issue_date),
144
            ('request start date', app.start_date),
145
            ('request end date', app.end_date),
146 146
            ('resources', app.resource_policies),
147 147
            ('join policy', app.member_join_policy_display),
148 148
            ('leave policy', app.member_leave_policy_display),
......
168 168
              ('homepage', app.homepage),
169 169
              ('description', app.description),
170 170
              ('comments for review', app.comments),
171
              ('request issue date', format_date(app.issue_date)),
172
              ('request start date', format_date(app.start_date)),
173
              ('creation date', format_date(project.creation_date)),
174
              ('request end date', format_date(app.end_date)),
171
              ('request issue date', app.issue_date),
172
              ('request start date', app.start_date),
173
              ('creation date', project.creation_date),
174
              ('request end date', app.end_date),
175 175
              ])
176 176

  
177 177
    deact_date = project.deactivation_date
178 178
    if deact_date is not None:
179
        d['deactivation date'] = format_date(deact_date)
179
        d['deactivation date'] = deact_date
180 180

  
181 181
    mem_limit = app.limit_on_members_number
182 182
    mem_limit_show = mem_limit if mem_limit is not None else "unlimited"
b/snf-astakos-app/astakos/im/management/commands/user-list.py
37 37

  
38 38
from astakos.im.models import AstakosUser
39 39

  
40
from ._common import format_bool
40
from ._common import format
41 41

  
42 42

  
43 43
class Command(NoArgsCommand):
......
79 79

  
80 80
        for user in users:
81 81
            id = str(user.id)
82
            active = format_bool(user.is_active)
83
            admin = format_bool(user.is_superuser)
82
            active = user.is_active
83
            admin = user.is_superuser
84 84
            uuid = user.uuid or ''
85
            fields = (
86
                id, user.email, user.realname, active, admin, \
87
                        uuid, user.auth_providers_display
88
            )
85
            fields = (format(elem) for elem in (
86
                            id,
87
                            user.email,
88
                            user.realname,
89
                            active, admin, uuid,
90
                            user.auth_providers_display
91
            ))
89 92

  
90 93
            if options['csv']:
91 94
                line = '|'.join(fields)

Also available in: Unified diff