Projet

Général

Profil

0001-general-remove-menu.json-handling-8590.patch

Frédéric Péters, 09 octobre 2015 17:21

Télécharger (2,48 ko)

Voir les différences: 

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(-)
passerelle/urls.py
7 7 
from django.views.static import serve as static_serve
8 8 

  		




  9
  9
  
    
from .views import (HomePageView, ManageView, ManageAddView,

  		




  10
  
  
    
        LEGACY_APPS_PATTERNS, LegacyPageView, login, logout, menu_json)

  		




  
  10
  
    
        LEGACY_APPS_PATTERNS, LegacyPageView, login, logout)

  		




  11
  11
  
    
from .urls_utils import decorated_includes, required, app_enabled

  		




  12
  12
  
    
from .base.urls import access_urlpatterns

  		




  13
  13
  
    
from .plugins import register_apps_urls

  		




  ......




  30
  30
  
    
    url(r'^legacy/$', LegacyPageView.as_view(), name='legacy'),

  		




  31
  31
  
    

  		




  32
  32
  
    
    url(r'^manage/$', login_required(ManageView.as_view()), name='manage-home'),

  		




  33
  
  
    
    url(r'^manage/menu.json$', login_required(menu_json), name='menu-json'),

  		




  34
  33
  
    
    url(r'^manage/add$', login_required(ManageAddView.as_view()), name='add-connector'),

  		




  35
  34
  
    

  		




  36
  35
  
    
    url(r'^media/(?P<path>.*)$', login_required(static_serve), {

  		












  

    
      passerelle/views.py
    
  





  40
  40
  
    
        next_page = '/'

  		




  41
  41
  
    
    return HttpResponseRedirect(next_page)

  		




  42
  42
  
    

  		




  43
  
  
    
def menu_json(request):

  		




  44
  
  
    
    response = HttpResponse(content_type='application/json')

  		




  45
  
  
    
    if getattr(settings, 'TEMPLATE_VARS', {}).get('site_title'):

  		




  46
  
  
    
        label = getattr(settings, 'TEMPLATE_VARS', {}).get('site_title')

  		




  47
  
  
    
    else:

  		




  48
  
  
    
        label = force_text(_('Connectors'))

  		




  49
  
  
    
    menu = {'slug': 'passerelle',

  		




  50
  
  
    
            'icon': 'connector',

  		




  51
  
  
    
            'url': request.build_absolute_uri(reverse('manage-home')),

  		




  52
  
  
    
            'label': label

  		




  53
  
  
    
    }

  		




  54
  
  
    
    menu = json.dumps(menu)

  		




  55
  
  
    
    for variable in ('jsonpCallback', 'callback'):

  		




  56
  
  
    
        if variable in request.GET:

  		




  57
  
  
    
            menu = '%s(%s);' % (request.GET[variable], menu)

  		




  58
  
  
    
            break

  		




  59
  
  
    
    response.write(menu)

  		




  60
  
  
    
    return response

  		




  61
  
  
    

  		




  62
  43
  
    

  		




  63
  44
  
    
class HomePageView(TemplateView):

  		




  64
  45
  
    
    template_name = 'passerelle/homepage.html'

  		




  65
  
  
    
-