merge recrutement + bypass rh.Poste dependancy

[auf_rh_dae.git] / project / urls.py

diff --git a/project/urls.py b/project/urls.py
index c0438ad..8633816 100644 (file)
--- a/project/urls.py
+++ b/project/urls.py
@@ -1,19 +1,22 @@
 # -*- encoding: utf-8 -*
 # -*- encoding: utf-8 -*

-from django.conf.urls.defaults import patterns, include, handler500, url
+from django.conf.urls.defaults import patterns, include, handler500, handler404, url

 from django.conf import settings
 from django.contrib import admin
 from auf.django.emploi import settings as sett
 
 from django.conf import settings
 from django.contrib import admin
 from auf.django.emploi import settings as sett
 

+from auf.django import permissions
+

 admin.autodiscover()
 admin.autodiscover()

+permissions.autodiscover()

 
 handler500 # Pyflakes
 
 urlpatterns = patterns(
     '',
 
 handler500 # Pyflakes
 
 urlpatterns = patterns(
     '',

-    # système
-    url(r'^$', 'project.views.accueil', name='accueil'),
-
+    (r'^$', 'project.views.index'),

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

+    url(r'^api/(?P<method>[a-z_-]+)/(?P<offre_id>\d+)/$', 'recrutement.api.api', 
+            name='recrutement_api'),

     url(r'^api/(?P<method>[a-z_-]+)/$', 'recrutement.api.api', 
             name='recrutement_api'),
     (r'^connexion/$', 'django.contrib.auth.views.login'),
     url(r'^api/(?P<method>[a-z_-]+)/$', 'recrutement.api.api', 
             name='recrutement_api'),
     (r'^connexion/$', 'django.contrib.auth.views.login'),

@@ -24,9 +27,6 @@ urlpatterns = patterns(
     (r'^tinymce/', include('tinymce.urls')),
     (r'^prive/(?P<path>.*)$', 'django.views.static.serve', 
         {'document_root': settings.PRIVE_MEDIA_ROOT}),
     (r'^tinymce/', include('tinymce.urls')),
     (r'^prive/(?P<path>.*)$', 'django.views.static.serve', 
         {'document_root': settings.PRIVE_MEDIA_ROOT}),

-    url(r'^404$', 'project.views.erreur404', name='404'),
-    url(r'^500$', 'project.views.erreur500', name='500'),
-    url(r'^550$', 'project.views.erreur550', name='550'),

 
     # apps
     (r'^dae/', include('project.dae.urls')),
 
     # apps
     (r'^dae/', include('project.dae.urls')),