projets
/
auf_rh_dae.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a58762e
)
Conflit d'URLs
author
Eric Mc Sween
<eric.mcsween@auf.org>
Fri, 4 Nov 2011 20:28:21 +0000
(16:28 -0400)
committer
Eric Mc Sween
<eric.mcsween@auf.org>
Fri, 4 Nov 2011 20:28:45 +0000
(16:28 -0400)
project/dae/urls.py
patch
|
blob
|
blame
|
history
diff --git
a/project/dae/urls.py
b/project/dae/urls.py
index
f72ab26
..
12426dc
100644
(file)
--- a/
project/dae/urls.py
+++ b/
project/dae/urls.py
@@
-23,7
+23,7
@@
urlpatterns = patterns(
# contrats
url(r'^embauches/(?P<dossier_id>\d+)/contrats/ajouter$', 'embauche_ajouter_contrat',
name='embauche_ajouter_contrat'),
- url(r'^contrats/(\d+)/(.*)$', 'contrat', name='contrat'),
+ url(r'^contrats/(\d+)/fichier/(.*)$', 'contrat', name='contrat'),
url(r'^contrats/(\d+)/supprimer$', 'contrat_supprimer', name='contrat_supprimer'),
# ajax