Projet

Général

Profil

0001-misc-update-url-patterns-not-to-refer-to-views-as-st.patch

Frédéric Péters, 28 décembre 2017 09:56

Télécharger (5,5 ko)

Voir les différences: 

Subject: [PATCH 1/3] misc: update url patterns not to refer to views as
 strings (#20909)


 welco/urls.py | 59 ++++++++++++++++++++++++++++++++---------------------------
 1 file changed, 32 insertions(+), 27 deletions(-)
welco/urls.py
26 26 
from . import apps
27 27 
from .kb.views import kb_manager_required
28 28 

  		




  
  29
  
    
import welco.views

  		




  
  30
  
    
import welco.contacts.views

  		




  
  31
  
    
import welco.kb.views

  		




  
  32
  
    

  		




  
  33
  
    

  		




  29
  34
  
    
urlpatterns = [

  		




  30
  
  
    
    url(r'^$', 'welco.views.home', name='home'),

  		




  31
  
  
    
    url(r'^mail/$', 'welco.views.home_mail', name='home-mail'),

  		




  32
  
  
    
    url(r'^phone/$', 'welco.views.home_phone', name='home-phone'),

  		




  33
  
  
    
    url(r'^counter/$', 'welco.views.home_counter', name='home-counter'),

  		




  
  35
  
    
    url(r'^$', welco.views.home, name='home'),

  		




  
  36
  
    
    url(r'^mail/$', welco.views.home_mail, name='home-mail'),

  		




  
  37
  
    
    url(r'^phone/$', welco.views.home_phone, name='home-phone'),

  		




  
  38
  
    
    url(r'^counter/$', welco.views.home_counter, name='home-counter'),

  		




  34
  39
  
    
    url(r'^', include('welco.sources.phone.urls')),

  		




  35
  40
  
    
    url(r'^', include('welco.sources.counter.urls')),

  		




  36
  
  
    
    url(r'^ajax/qualification$', 'welco.views.qualification', name='qualif-zone'),

  		




  37
  
  
    
    url(r'^ajax/qualification-done$', 'welco.views.qualification_done', name='qualif-done'),

  		




  
  41
  
    
    url(r'^ajax/qualification$', welco.views.qualification, name='qualif-zone'),

  		




  
  42
  
    
    url(r'^ajax/qualification-done$', welco.views.qualification_done, name='qualif-done'),

  		




  38
  43
  
    
    url(r'^ajax/remove-association/(?P<pk>\w+)$',

  		




  39
  
  
    
        'welco.views.remove_association', name='ajax-remove-association'),

  		




  
  44
  
    
        welco.views.remove_association, name='ajax-remove-association'),

  		




  40
  45
  
    
    url(r'^ajax/create-formdata/(?P<pk>\w+)$',

  		




  41
  
  
    
        'welco.views.create_formdata', name='ajax-create-formdata'),

  		




  
  46
  
    
        welco.views.create_formdata, name='ajax-create-formdata'),

  		




  42
  47
  
    

  		




  43
  
  
    
    url(r'^ajax/kb$', 'welco.kb.views.zone', name='kb-zone'),

  		




  44
  
  
    
    url(r'^kb/$', 'welco.kb.views.page_list', name='kb-home'),

  		




  45
  
  
    
    url(r'^kb/add/$', 'welco.kb.views.page_add', name='kb-page-add'),

  		




  46
  
  
    
    url(r'^kb/search/$', 'welco.kb.views.page_search', name='kb-page-search'),

  		




  47
  
  
    
    url(r'^kb/search/json/$', 'welco.kb.views.page_search_json', name='kb-page-search-json'),

  		




  48
  
  
    
    url(r'^kb/(?P<slug>[\w-]+)/$', 'welco.kb.views.page_detail', name='kb-page-view'),

  		




  49
  
  
    
    url(r'^ajax/kb/(?P<slug>[\w-]+)/$', 'welco.kb.views.page_detail_fragment', name='kb-page-fragment'),

  		




  50
  
  
    
    url(r'^kb/(?P<slug>[\w-]+)/edit$', 'welco.kb.views.page_edit', name='kb-page-edit'),

  		




  51
  
  
    
    url(r'^kb/(?P<slug>[\w-]+)/delete$', 'welco.kb.views.page_delete', name='kb-page-delete'),

  		




  52
  
  
    
    url(r'^kb/(?P<slug>[\w-]+)/history$', 'welco.kb.views.page_history', name='kb-page-history'),

  		




  53
  
  
    
    url(r'^kb/(?P<slug>[\w-]+)/version/(?P<version>\w+)/$', 'welco.kb.views.page_version', name='kb-page-version'),

  		




  
  48
  
    
    url(r'^ajax/kb$', welco.kb.views.zone, name='kb-zone'),

  		




  
  49
  
    
    url(r'^kb/$', welco.kb.views.page_list, name='kb-home'),

  		




  
  50
  
    
    url(r'^kb/add/$', welco.kb.views.page_add, name='kb-page-add'),

  		




  
  51
  
    
    url(r'^kb/search/$', welco.kb.views.page_search, name='kb-page-search'),

  		




  
  52
  
    
    url(r'^kb/search/json/$', welco.kb.views.page_search_json, name='kb-page-search-json'),

  		




  
  53
  
    
    url(r'^kb/(?P<slug>[\w-]+)/$', welco.kb.views.page_detail, name='kb-page-view'),

  		




  
  54
  
    
    url(r'^ajax/kb/(?P<slug>[\w-]+)/$', welco.kb.views.page_detail_fragment, name='kb-page-fragment'),

  		




  
  55
  
    
    url(r'^kb/(?P<slug>[\w-]+)/edit$', welco.kb.views.page_edit, name='kb-page-edit'),

  		




  
  56
  
    
    url(r'^kb/(?P<slug>[\w-]+)/delete$', welco.kb.views.page_delete, name='kb-page-delete'),

  		




  
  57
  
    
    url(r'^kb/(?P<slug>[\w-]+)/history$', welco.kb.views.page_history, name='kb-page-history'),

  		




  
  58
  
    
    url(r'^kb/(?P<slug>[\w-]+)/version/(?P<version>\w+)/$', welco.kb.views.page_version, name='kb-page-version'),

  		




  54
  59
  
    

  		




  55
  
  
    
    url(r'^ajax/contacts$', 'welco.contacts.views.zone', name='contacts-zone'),

  		




  56
  
  
    
    url(r'^contacts/search/json/$', 'welco.contacts.views.search_json', name='contacts-search-json'),

  		




  
  60
  
    
    url(r'^ajax/contacts$', welco.contacts.views.zone, name='contacts-zone'),

  		




  
  61
  
    
    url(r'^contacts/search/json/$', welco.contacts.views.search_json, name='contacts-search-json'),

  		




  57
  62
  
    
    url(r'^ajax/contacts/(?P<slug>[\w-]+)/$',

  		




  58
  
  
    
        'welco.contacts.views.contact_detail_fragment', name='contact-page-fragment'),

  		




  59
  
  
    
    url(r'^contacts/add/$', 'welco.contacts.views.contact_add', name='contacts-add'),

  		




  
  63
  
    
        welco.contacts.views.contact_detail_fragment, name='contact-page-fragment'),

  		




  
  64
  
    
    url(r'^contacts/add/$', welco.contacts.views.contact_add, name='contacts-add'),

  		




  60
  65
  
    

  		




  61
  66
  
    
    url(r'^ajax/summary/(?P<source_type>\w+)/(?P<source_pk>\w+)/$',

  		




  62
  
  
    
        'welco.views.wcs_summary', name='wcs-summary'),

  		




  
  67
  
    
        welco.views.wcs_summary, name='wcs-summary'),

  		




  63
  68
  
    

  		




  64
  69
  
    
    url(r'^admin/', include(admin.site.urls)),

  		




  65
  
  
    
    url(r'^logout/$', 'welco.views.logout', name='auth_logout'),

  		




  66
  
  
    
    url(r'^login/$', 'welco.views.login', name='auth_login'),

  		




  67
  
  
    
    url(r'^menu.json$', 'welco.views.menu_json', name='menu_json'),

  		




  
  70
  
    
    url(r'^logout/$', welco.views.logout, name='auth_logout'),

  		




  
  71
  
    
    url(r'^login/$', welco.views.login, name='auth_login'),

  		




  
  72
  
    
    url(r'^menu.json$', welco.views.menu_json, name='menu_json'),

  		




  68
  73
  
    

  		




  69
  74
  
    
    url(r'^ckeditor/upload/', kb_manager_required(ckeditor_views.upload), name='ckeditor_upload'),

  		




  70
  75
  
    
    url(r'^ckeditor/browse/', never_cache(kb_manager_required(ckeditor_views.browse)), name='ckeditor_browse'),

  		




  71
  
  
    
-