cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity

Merge branch 'master' into Kerl/venv

Browse source
This commit is contained in:
Martin Pépin 2016-11-18 01:09:39 +01:00
commit 6de2fa307b
12 changed files with 82 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

25
cof/urls.py
View file

@ -27,7 +27,7 @@ from gestioncof.autocomplete import autocomplete
autocomplete_light.autodiscover()
admin.autodiscover()
my_urlpatterns = [
urlpatterns = [
# Page d'accueil
url(r'^$', gestioncof_views.home, name='home'),
# Le BdA
@ -51,7 +51,7 @@ my_urlpatterns = [
url(r'^cas/logout$', django_cas_views.logout),
url(r'^outsider/login$', gestioncof_views.login_ext),
url(r'^outsider/logout$', django_views.logout, {'next_page': 'home'}),
url(r'^login$', gestioncof_views.login),
url(r'^login$', gestioncof_views.login, name="cof-login"),
url(r'^logout$', gestioncof_views.logout),
# Infos persos
url(r'^profile$', gestioncof_views.profile),
@ -84,21 +84,16 @@ my_urlpatterns = [
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),
url(r'^k-fet/', include('kfet.urls'))
] + \
(static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
if settings.DEBUG
else [])
# Si on est en production, MEDIA_ROOT est servi par Apache.
# Il faut dire à Django de servir MEDIA_ROOT lui-même en développement.
url(r'^k-fet/', include('kfet.urls')),
]
if settings.DEBUG:
import debug_toolbar
my_urlpatterns += [
url(r'^__debug__/',
include(debug_toolbar.urls)),
urlpatterns += [
url(r'^__debug__/', include(debug_toolbar.urls)),
]
urlpatterns = [
url(r'^gestion/', include(my_urlpatterns))
]
# Si on est en production, MEDIA_ROOT est servi par Apache.
# Il faut dire à Django de servir MEDIA_ROOT lui-même en développement.
urlpatterns += static(settings.MEDIA_URL,
document_root=settings.MEDIA_ROOT)