Projet

Général

Profil

0001-manager-remove-json-export-fixes-28669.patch

Benjamin Dauvergne, 06 décembre 2018 16:38

Télécharger (2,75 ko)

Voir les différences:

Subject: [PATCH] manager: remove json export (fixes #28669)

 src/authentic2/manager/urls.py  | 6 +++---
 src/authentic2/manager/views.py | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)
src/authentic2/manager/urls.py
19 19

  
20 20
        # Authentic2 users
21 21
        url(r'^users/$', user_views.users, name='a2-manager-users'),
22
        url(r'^users/export/(?P<format>csv|json|html|ods)/$',
22
        url(r'^users/export/(?P<format>csv)/$',
23 23
            user_views.users_export, name='a2-manager-users-export'),
24 24
        url(r'^users/add/$', user_views.user_add_default_ou,
25 25
            name='a2-manager-user-add-default-ou'),
......
60 60
            name='a2-manager-roles'),
61 61
        url(r'^roles/add/$', role_views.add,
62 62
            name='a2-manager-role-add'),
63
        url(r'^roles/export/(?P<format>csv|json|html|ods)/$',
63
        url(r'^roles/export/(?P<format>csv)/$',
64 64
            role_views.export, name='a2-manager-roles-export'),
65 65
        url(r'^roles/(?P<pk>\d+)/$', role_views.members,
66 66
            name='a2-manager-role-members'),
......
83 83
        url(r'^roles/(?P<pk>\d+)/remove-admin-role/(?P<role_pk>\d+)/$',
84 84
            role_views.remove_admin_role, name='a2-manager-role-remove-admin-role'),
85 85

  
86
        url(r'^roles/(?P<pk>\d+)/export/(?P<format>csv|json|html|ods)/$',
86
        url(r'^roles/(?P<pk>\d+)/export/(?P<format>csv)/$',
87 87
            role_views.members_export,
88 88
            name='a2-manager-role-members-export'),
89 89
        url(r'^roles/(?P<pk>\d+)/delete/$', role_views.delete,
src/authentic2/manager/views.py
197 197
class FormatsContextData(object):
198 198
    '''Export list of supported formats in context'''
199 199

  
200
    formats = ['csv', 'json']
200
    formats = ['csv']
201 201

  
202 202
    def get_context_data(self, **kwargs):
203 203
        ctx = super(FormatsContextData, self).get_context_data(**kwargs)
......
358 358
        export_format = kwargs['format'].lower()
359 359
        content_types = {
360 360
            'csv': 'text/csv',
361
            'json': 'application/json',
362
            'ods': 'application/vnd.oasis.opendocument.spreadsheet',
363 361
        }
364 362
        if export_format not in content_types:
365 363
            raise Http404('unknown format')
366
-