Modification of hard link to manage then in settings. Correction of false submission of route.

git-svn-id: http://www.peacefrogs.net/svn/chimere/trunk@26 9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864

1 files changed, 12 insertions, 12 deletions

diff --git a/urls.py b/urls.py
index eb09cff..fb93e45 100644
--- a/urls.py
+++ b/urls.py
@@ -3,27 +3,27 @@ from django.conf.urls.defaults import *
 from django.contrib import admin
 admin.autodiscover()
 
-from settings import ROOT_PATH
+from settings import ROOT_PATH, EXTRA_URL
 
 js_info_dict = {
     'packages': 'chimere',
 }
 
 urlpatterns = patterns('',
-    (r'^chimere/admin/(.*)', admin.site.root),
-    (r'^chimere/$', 'chimere.main.views.index'),
-    (r'^chimere/edit/$', 'chimere.main.views.edit'),
-    (r'^chimere/edit_route/$', 'chimere.main.views.editRoute'),
-    (r'^chimere/submited/(?P<action>\w+)/$$', 'chimere.main.views.submited'),
-    (r'^chimere/getDetail/(?P<marker_id>\d+)/$',
+    (r'^' + EXTRA_URL + r'admin/(.*)', admin.site.root),
+    (r'^' + EXTRA_URL + r'$', 'chimere.main.views.index'),
+    (r'^' + EXTRA_URL + r'edit/$', 'chimere.main.views.edit'),
+    (r'^' + EXTRA_URL + r'edit_route/$', 'chimere.main.views.editRoute'),
+    (r'^' + EXTRA_URL + r'submited/(?P<action>\w+)/$$', 'chimere.main.views.submited'),
+    (r'^' + EXTRA_URL + r'getDetail/(?P<marker_id>\d+)/$',
                 'chimere.main.views.getDetail'),
-    (r'^chimere/getGeoObjects/(?P<category_ids>\w+)/$',
+    (r'^' + EXTRA_URL + 'getGeoObjects/(?P<category_ids>\w+)/$',
                 'chimere.main.views.getGeoObjects'),
-    (r'^chimere/getGeoObjects/(?P<category_ids>\w+)/(?P<status>\w+)$',
+    (r'^' + EXTRA_URL + 'getGeoObjects/(?P<category_ids>\w+)/(?P<status>\w+)$',
                 'chimere.main.views.getGeoObjects'),
-    (r'^chimere/static/(?P<path>.*)$', 'django.views.static.serve',
+    (r'^' + EXTRA_URL + 'static/(?P<path>.*)$', 'django.views.static.serve',
                          {'document_root': ROOT_PATH + 'static/'}),
-    (r'^chimere/media/(?P<path>.*)$', 'django.views.static.serve',
+    (r'^' + EXTRA_URL + 'media/(?P<path>.*)$', 'django.views.static.serve',
                           {'document_root': ROOT_PATH + 'media/'}),
-    (r'^chimere/jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict),
+    (r'^' + EXTRA_URL + 'jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict),
 )