From 8142ef2ee52aa27e1af71ab466d86b5eb9d5d5e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20P=C3=A9pin?= Date: Wed, 8 Jun 2016 22:28:38 +0200 Subject: [PATCH 1/2] =?UTF-8?q?S=C3=A9pare=20les=20urls=20entre=20les=20di?= =?UTF-8?q?ff=C3=A9rentes=20apps?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ajoute des commentaires dans `cof/urls` qui donnent des indications sur les groupes d'urls. Enjolive le code --- bda/urls.py | 36 +++++++++++++++++++++ cof/urls.py | 78 +++++++++++++++++++++++----------------------- gestioncof/urls.py | 42 +++++++++++++++++++++++++ 3 files changed, 117 insertions(+), 39 deletions(-) create mode 100644 bda/urls.py create mode 100644 gestioncof/urls.py diff --git a/bda/urls.py b/bda/urls.py new file mode 100644 index 00000000..a1ba1d8c --- /dev/null +++ b/bda/urls.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- + +from django.conf.urls import include, url, patterns +from bda import views +from bda.views import SpectacleListView + +urlpatterns = patterns('', + url(r'inscription/(?P\d+)$', + 'bda.views.inscription', + name='bda-tirage-inscription'), + url(r'places/(?P\d+)$', + 'bda.views.places', + name="bda-places-attribuees"), + url(r'places/(?P\d+)/places_bda.ics$', + 'bda.views.places_ics', + name="bda-places-attribuees-ics"), + url(r'revente/(?P\d+)$', + 'bda.views.revente', + name='bda-revente'), + url(r'etat-places/(?P\d+)$', + 'bda.views.etat_places', + name='bda-etat-places'), + url(r'tirage/(?P\d+)$', 'bda.views.tirage'), + url(r'spectacles/(?P\d+)$', + SpectacleListView.as_view() , + name ="bda-liste-spectacles"), + url(r'spectacles/(?P\d+)/(?P\d+)$', + "bda.views.spectacle", + name="bda-spectacle"), + url(r'spectacles-ics/(?P\d+)$', + 'bda.views.liste_spectacles_ics', + name ="bda-liste-spectacles-ics"), + url(r'spectacles/unpaid/(?P\d+)$', + "bda.views.unpaid", + name="bda-unpaid"), +) diff --git a/cof/urls.py b/cof/urls.py index e841ee02..0e21c428 100644 --- a/cof/urls.py +++ b/cof/urls.py @@ -7,62 +7,62 @@ from django.contrib import admin admin.autodiscover() from django.views.generic.base import TemplateView -from bda.models import Spectacle -from bda.views import SpectacleListView -from gestioncof.petits_cours_views import DemandeListView + +from gestioncof.urls import export_patterns, petitcours_patterns, \ + surveys_patterns, events_patterns urlpatterns = patterns('', + # Page d'accueil url(r'^$', 'gestioncof.views.home', name = 'home'), - url(r'^cof/denied$', TemplateView.as_view(template_name = 'cof-denied.html'), name = "cof-denied"), - url(r'^cas/login$', 'django_cas_ng.views.login', name = "cas_login_view"), + # Le BdA + url(r'^bda/', include('bda.urls')), + # Les exports + url(r'^export/', include(export_patterns)), + # Les petits cours + url(r'^petitcours/', include(petitcours_patterns)), + # Les sondages + url(r'^survey/', include(surveys_patterns)), + # Evenements + url(r'^event/', include(events_patterns)), + # Authentification + url(r'^cof/denied$', TemplateView.as_view(template_name='cof-denied.html'), + name="cof-denied"), + url(r'^cas/login$', 'django_cas_ng.views.login', name="cas_login_view"), url(r'^cas/logout$', 'django_cas_ng.views.logout'), url(r'^outsider/login$', 'gestioncof.views.login_ext'), - url(r'^outsider/logout$', 'django.contrib.auth.views.logout', {'next_page': '/gestion/'}), - url(r'^outsider/password-change$', 'django.contrib.auth.views.password_change'), - url(r'^outsider/password-change-done$', 'django.contrib.auth.views.password_change_done'), + url(r'^outsider/logout$', 'django.contrib.auth.views.logout', + {'next_page': '/gestion/'}), url(r'^login$', 'gestioncof.views.login'), url(r'^logout$', 'gestioncof.views.logout'), + # Infos persos url(r'^profile$', 'gestioncof.views.profile'), - url(r'^export/members$', 'gestioncof.views.export_members'), - url(r'^export/mega/avecremarques$', 'gestioncof.views.export_mega_remarksonly'), - url(r'^export/mega/participants$', 'gestioncof.views.export_mega_participants'), - url(r'^export/mega/orgas$', 'gestioncof.views.export_mega_orgas'), - url(r'^export/mega/(?P.+)$', 'gestioncof.views.export_mega_bytype'), - url(r'^export/mega$', 'gestioncof.views.export_mega'), + url(r'^outsider/password-change$', + 'django.contrib.auth.views.password_change'), + url(r'^outsider/password-change-done$', + 'django.contrib.auth.views.password_change_done'), + # Inscription d'un nouveau membre url(r'^registration$', 'gestioncof.views.registration'), - url(r'^registration/clipper/(?P[\w-]+)$', 'gestioncof.views.registration_form2', name = "clipper-registration"), - url(r'^registration/user/(?P.+)$', 'gestioncof.views.registration_form2', name = "user-registration"), - url(r'^registration/empty$', 'gestioncof.views.registration_form2', name = "empty-registration"), - url(r'^petitcours/inscription$', 'gestioncof.petits_cours_views.inscription', name = 'petits-cours-inscription'), - url(r'^petitcours/demande$', 'gestioncof.petits_cours_views.demande', name = 'petits-cours-demande'), - url(r'^petitcours/demande-raw$', 'gestioncof.petits_cours_views.demande_raw', name = 'petits-cours-demande-raw'), - url(r'^petitcours/demandes$', DemandeListView.as_view(), name = 'petits-cours-demandes-list'), - url(r'^petitcours/demandes/(?P\d+)$', 'gestioncof.petits_cours_views.details', name = 'petits-cours-demande-details'), - url(r'^petitcours/demandes/(?P\d+)/traitement$', 'gestioncof.petits_cours_views.traitement', name = 'petits-cours-demande-traitement'), - url(r'^petitcours/demandes/(?P\d+)/retraitement$', 'gestioncof.petits_cours_views.retraitement', name = 'petits-cours-demande-retraitement'), - url(r'^bda/inscription/(?P\d+)$', 'bda.views.inscription', name = 'bda-tirage-inscription'), - url(r'^bda/places/(?P\d+)$', 'bda.views.places', name = "bda-places-attribuees"), - url(r'^bda/places/(?P\d+)/places_bda.ics$', 'bda.views.places_ics', name = "bda-places-attribuees-ics"), - url(r'^bda/revente/(?P\d+)$', 'bda.views.revente', name = 'bda-revente'), - url(r'^bda/etat-places/(?P\d+)$', 'bda.views.etat_places', name = 'bda-etat-places'), - url(r'^bda/tirage/(?P\d+)$', 'bda.views.tirage'), - url(r'^bda/spectacles/(?P\d+)$', SpectacleListView.as_view() , name ="bda-liste-spectacles"), - url(r'^bda/spectacles/(?P\d+)/(?P\d+)$', "bda.views.spectacle", name = "bda-spectacle"), - url(r'^bda/spectacles-ics/(?P\d+)$', 'bda.views.liste_spectacles_ics', name ="bda-liste-spectacles-ics"), - url(r'^bda/spectacles/unpaid/(?P\d+)$', "bda.views.unpaid", name = "bda-unpaid"), - url(r'^survey/(?P\d+)$', 'gestioncof.views.survey'), - url(r'^event/(?P\d+)$', 'gestioncof.views.event'), - url(r'^survey/(?P\d+)/status$', 'gestioncof.views.survey_status'), - url(r'^event/(?P\d+)/status$', 'gestioncof.views.event_status'), + url(r'^registration/clipper/(?P[\w-]+)$', + 'gestioncof.views.registration_form2', name="clipper-registration"), + url(r'^registration/user/(?P.+)$', + 'gestioncof.views.registration_form2', name="user-registration"), + url(r'^registration/empty$', 'gestioncof.views.registration_form2', + name="empty-registration"), + # Autocompletion url(r'^autocomplete/registration$', 'gestioncof.autocomplete.autocomplete'), url(r'^autocomplete/', include('autocomplete_light.urls')), + # Interface admin url(r'^admin/doc/', include('django.contrib.admindocs.urls')), - url(r'^admin/(?P[\d\w]+)/(?P[\d\w]+)/csv/', 'gestioncof.csv_views.admin_list_export', {'fields': ['username',]}), + url(r'^admin/(?P[\d\w]+)/(?P[\d\w]+)/csv/', + 'gestioncof.csv_views.admin_list_export', + {'fields': ['username',]}), url(r'^admin/', include(admin.site.urls)), url(r'^grappelli/', include('grappelli.urls')), + # Liens utiles du COF et du BdA url(r'^utile_cof$', 'gestioncof.views.utile_cof'), url(r'^utile_bda$', 'gestioncof.views.utile_bda'), url(r'^utile_bda/bda_diff$', 'gestioncof.views.liste_bdadiff'), url(r'^utile_cof/diff_cof$', 'gestioncof.views.liste_diffcof'), url(r'^utile_bda/bda_revente$', 'gestioncof.views.liste_bdarevente'), ) + diff --git a/gestioncof/urls.py b/gestioncof/urls.py new file mode 100644 index 00000000..f8693d57 --- /dev/null +++ b/gestioncof/urls.py @@ -0,0 +1,42 @@ +from django.conf.urls import url +from gestioncof.petits_cours_views import DemandeListView + +export_patterns = [ + url(r'members$', 'gestioncof.views.export_members'), + url(r'mega/avecremarques$', 'gestioncof.views.export_mega_remarksonly'), + url(r'mega/participants$', 'gestioncof.views.export_mega_participants'), + url(r'mega/orgas$', 'gestioncof.views.export_mega_orgas'), + url(r'mega/(?P.+)$', 'gestioncof.views.export_mega_bytype'), + url(r'mega$', 'gestioncof.views.export_mega'), +] + +petitcours_patterns = [ + url(r'inscription$', 'gestioncof.petits_cours_views.inscription', + name='petits-cours-inscription'), + url(r'demande$', 'gestioncof.petits_cours_views.demande', + name='petits-cours-demande'), + url(r'demande-raw$', 'gestioncof.petits_cours_views.demande_raw', + name='petits-cours-demande-raw'), + url(r'demandes$', DemandeListView.as_view(), + name='petits-cours-demandes-list'), + url(r'demandes/(?P\d+)$', 'gestioncof.petits_cours_views.details', + name='petits-cours-demande-details'), + url(r'demandes/(?P\d+)/traitement$', + 'gestioncof.petits_cours_views.traitement', + name='petits-cours-demande-traitement'), + url(r'demandes/(?P\d+)/retraitement$', + 'gestioncof.petits_cours_views.retraitement', + name='petits-cours-demande-retraitement'), +] + +surveys_patterns = [ + url(r'^survey/(?P\d+)/status$', 'gestioncof.views.survey_status'), + url(r'^survey/(?P\d+)$', 'gestioncof.views.survey'), +] + +events_patterns = [ + url(r'^event/(?P\d+)$', 'gestioncof.views.event'), + url(r'^event/(?P\d+)/status$', 'gestioncof.views.event_status'), +] + + From b222c944f69f8f230af3868779aaac45cda7a327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20P=C3=A9pin?= Date: Fri, 10 Jun 2016 23:16:39 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Change=20la=20redirection=20apr=C3=A8s=20'/?= =?UTF-8?q?outsider/logout'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On change `/gestion/` en `home` qui fait la même chose mais fonctionne à la fois en dev et en prod. --- cof/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cof/urls.py b/cof/urls.py index b9628d0f..ce7cd6f6 100644 --- a/cof/urls.py +++ b/cof/urls.py @@ -31,7 +31,7 @@ urlpatterns = patterns('', url(r'^cas/logout$', 'django_cas_ng.views.logout'), url(r'^outsider/login$', 'gestioncof.views.login_ext'), url(r'^outsider/logout$', 'django.contrib.auth.views.logout', - {'next_page': '/gestion/'}), + {'next_page': 'home'}), url(r'^login$', 'gestioncof.views.login'), url(r'^logout$', 'gestioncof.views.logout'), # Infos persos