From a8e7f2661622d24ce8c8e023459af05488176d53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Fri, 9 Oct 2015 17:20:58 +0200 Subject: [PATCH] general: remove menu.json handling (#8590) We don't want direct links to Passerelle for now. --- passerelle/urls.py | 3 +-- passerelle/views.py | 19 ------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/passerelle/urls.py b/passerelle/urls.py index c6a808e..7aba345 100644 --- a/passerelle/urls.py +++ b/passerelle/urls.py @@ -7,7 +7,7 @@ from django.contrib.auth.decorators import login_required from django.views.static import serve as static_serve from .views import (HomePageView, ManageView, ManageAddView, - LEGACY_APPS_PATTERNS, LegacyPageView, login, logout, menu_json) + LEGACY_APPS_PATTERNS, LegacyPageView, login, logout) from .urls_utils import decorated_includes, required, app_enabled from .base.urls import access_urlpatterns from .plugins import register_apps_urls @@ -30,7 +30,6 @@ urlpatterns = patterns('', url(r'^legacy/$', LegacyPageView.as_view(), name='legacy'), url(r'^manage/$', login_required(ManageView.as_view()), name='manage-home'), - url(r'^manage/menu.json$', login_required(menu_json), name='menu-json'), url(r'^manage/add$', login_required(ManageAddView.as_view()), name='add-connector'), url(r'^media/(?P.*)$', login_required(static_serve), { diff --git a/passerelle/views.py b/passerelle/views.py index cc78418..91599dc 100644 --- a/passerelle/views.py +++ b/passerelle/views.py @@ -40,25 +40,6 @@ def logout(request, next_page=None): next_page = '/' return HttpResponseRedirect(next_page) -def menu_json(request): - response = HttpResponse(content_type='application/json') - if getattr(settings, 'TEMPLATE_VARS', {}).get('site_title'): - label = getattr(settings, 'TEMPLATE_VARS', {}).get('site_title') - else: - label = force_text(_('Connectors')) - menu = {'slug': 'passerelle', - 'icon': 'connector', - 'url': request.build_absolute_uri(reverse('manage-home')), - 'label': label - } - menu = json.dumps(menu) - for variable in ('jsonpCallback', 'callback'): - if variable in request.GET: - menu = '%s(%s);' % (request.GET[variable], menu) - break - response.write(menu) - return response - class HomePageView(TemplateView): template_name = 'passerelle/homepage.html' -- 2.6.1