From b8778e64d2e846f41b14fe751dfe86b6dea7842d Mon Sep 17 00:00:00 2001 From: Nilovna Bascunan-Vasquez Date: Fri, 29 Jul 2011 16:19:47 -0400 Subject: [PATCH] =?utf8?q?1829:=20R=C3=A9organiser=20les=20urls=20pour=20rec?= =?utf8?q?rutement?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- project/recrutement/admin.py | 5 +++++ project/recrutement/urls.py | 27 +++++++++++++++++++++++++-- project/urls.py | 18 +----------------- 3 files changed, 31 insertions(+), 19 deletions(-) diff --git a/project/recrutement/admin.py b/project/recrutement/admin.py index 979c46b..aabc4f3 100644 --- a/project/recrutement/admin.py +++ b/project/recrutement/admin.py @@ -117,6 +117,11 @@ class ProxyOffreEmploiAdmin(OffreEmploiAdmin): }), ) + def get_actions(self, request): + actions = super(ProxyOffreEmploiAdmin, self).get_actions(request) + del actions['affecter_evaluateurs_offre_emploi'] + return actions + def response_change(self, request, obj): response = super(ProxyOffreEmploiAdmin, self).response_change(request, obj) user_groupes = request.user.groups.all() diff --git a/project/recrutement/urls.py b/project/recrutement/urls.py index f231760..9712754 100644 --- a/project/recrutement/urls.py +++ b/project/recrutement/urls.py @@ -1,7 +1,30 @@ # -*- encoding: utf-8 -* from django.conf.urls.defaults import patterns, url -urlpatterns = patterns( - 'project.recrutement.views', + + + +urlpatterns = patterns('', url(r'^$', 'index', name='index'), + + url(r'^affecter_evaluateurs_offre_emploi/$', + 'recrutement.views.affecter_evaluateurs_offre_emploi', + name='affecter_evaluateurs_offre_emploi'), + + url(r'^envoyer_courriel_candidats/$', + 'recrutement.views.envoyer_courriel_candidats', + name='envoyer_courriel_candidats'), + + url(r'^selectionner_template/$', + 'recrutement.views.selectionner_template', + name='selectionner_template'), + + url(r'^pieces/$', 'recrutement.views.postuler_appel_offre', + name='pieces'), + + url(r'^api/(?P[a-z_-]+)/$', + 'recrutement.api.api', name='recrutement_api'), + + url(r'^postuler_appel_offre/$', + 'recrutement.views.postuler_appel_offre', name='postuler_appel_offre'), ) diff --git a/project/urls.py b/project/urls.py index baf021e..97bfab4 100644 --- a/project/urls.py +++ b/project/urls.py @@ -11,29 +11,13 @@ handler500 # Pyflakes urlpatterns = patterns( '', (r'^$', 'project.views.index'), - #url(r'^private_files/', include('private_files.urls')), url(r'^captcha/', include('captcha.urls')), url(r'^admin_tools/', include('admin_tools.urls')), (r'^admin/', include(admin.site.urls)), (r'^connexion/$', 'django.contrib.auth.views.login'), (r'^deconnexion/$', 'django.contrib.auth.views.logout'), (r'^dae/', include('project.dae.urls')), - (r'^recrutement/', include('project.recrutement.urls')), - url(r'^recrutement/affecter_evaluateurs_offre_emploi/$', - 'recrutement.views.affecter_evaluateurs_offre_emploi', - name='affecter_evaluateurs_offre_emploi'), - url(r'^recrutement/envoyer_courriel_candidats/$', - 'recrutement.views.envoyer_courriel_candidats', - name='envoyer_courriel_candidats'), - url(r'^recrutement/selectionner_template/$', - 'recrutement.views.selectionner_template', - name='selectionner_template'), - url(r'^recrutement/pieces/$', 'recrutement.views.postuler_appel_offre', - name='pieces'), - url(r'^api/(?P[a-z_-]+)/$', - 'recrutement.api.api', name='recrutement_api'), - url(r'^recrutement/postuler_appel_offre/$', - 'recrutement.views.postuler_appel_offre', name='postuler_appel_offre'), + (r'^recrutement/', include('recrutement.urls')), (r'^tinymce/', include('tinymce.urls')), (r'^', include('project.rh.urls')), (r'^prive/(?P.*)$', 'django.views.static.serve', -- 1.7.10.4