From f8b251789985039ad80ee23a6e9c4bd4e54c66c8 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Thu, 6 Dec 2018 10:27:06 +0100 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(-) diff --git a/src/authentic2/manager/urls.py b/src/authentic2/manager/urls.py index 1893f471..6149bc88 100644 --- a/src/authentic2/manager/urls.py +++ b/src/authentic2/manager/urls.py @@ -19,7 +19,7 @@ urlpatterns = required( # Authentic2 users url(r'^users/$', user_views.users, name='a2-manager-users'), - url(r'^users/export/(?Pcsv|json|html|ods)/$', + url(r'^users/export/(?Pcsv)/$', user_views.users_export, name='a2-manager-users-export'), url(r'^users/add/$', user_views.user_add_default_ou, name='a2-manager-user-add-default-ou'), @@ -60,7 +60,7 @@ urlpatterns = required( name='a2-manager-roles'), url(r'^roles/add/$', role_views.add, name='a2-manager-role-add'), - url(r'^roles/export/(?Pcsv|json|html|ods)/$', + url(r'^roles/export/(?Pcsv)/$', role_views.export, name='a2-manager-roles-export'), url(r'^roles/(?P\d+)/$', role_views.members, name='a2-manager-role-members'), @@ -83,7 +83,7 @@ urlpatterns = required( url(r'^roles/(?P\d+)/remove-admin-role/(?P\d+)/$', role_views.remove_admin_role, name='a2-manager-role-remove-admin-role'), - url(r'^roles/(?P\d+)/export/(?Pcsv|json|html|ods)/$', + url(r'^roles/(?P\d+)/export/(?Pcsv)/$', role_views.members_export, name='a2-manager-role-members-export'), url(r'^roles/(?P\d+)/delete/$', role_views.delete, diff --git a/src/authentic2/manager/views.py b/src/authentic2/manager/views.py index 44fe1d4e..56ef47d9 100644 --- a/src/authentic2/manager/views.py +++ b/src/authentic2/manager/views.py @@ -197,7 +197,7 @@ class SearchFormMixin(object): class FormatsContextData(object): '''Export list of supported formats in context''' - formats = ['csv', 'json'] + formats = ['csv'] def get_context_data(self, **kwargs): ctx = super(FormatsContextData, self).get_context_data(**kwargs) @@ -358,8 +358,6 @@ class ExportMixin(object): export_format = kwargs['format'].lower() content_types = { 'csv': 'text/csv', - 'json': 'application/json', - 'ods': 'application/vnd.oasis.opendocument.spreadsheet', } if export_format not in content_types: raise Http404('unknown format') -- 2.18.0