Dynamic loading of categories #80 - Reactivate the check-all button #81

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

1 files changed, 16 insertions, 15 deletions

diff --git a/chimere/urls.py b/chimere/urls.py
index 0cf6862..a018d4a 100644
--- a/chimere/urls.py
+++ b/chimere/urls.py
@@ -9,24 +9,25 @@ js_info_dict = {
     'packages': 'chimere',
 }
 
+base = '^' + EXTRA_URL
+
 urlpatterns = patterns('',
-    (r'^' + EXTRA_URL + r'admin/(.*)', admin.site.root),
-    (r'^' + EXTRA_URL + r'$', 'chimere.main.views.index'),
-    (r'^' + EXTRA_URL + r'contact/$', 'chimere.main.views.contactus'),
-    (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'^' + EXTRA_URL + r'getDescriptionDetail/(?P<category_id>\d+)/$',
+    (base + r'admin/(.*)', admin.site.root),
+    (base + r'$', 'chimere.main.views.index'),
+    (base + r'contact/$', 'chimere.main.views.contactus'),
+    (base + r'edit/$', 'chimere.main.views.edit'),
+    (base + r'edit_route/$', 'chimere.main.views.editRoute'),
+    (base + r'submited/(?P<action>\w+)/$$', 'chimere.main.views.submited'),
+    (base + r'getDetail/(?P<marker_id>\d+)/$', 'chimere.main.views.getDetail'),
+    (base + r'getDescriptionDetail/(?P<category_id>\d+)/$',
                 'chimere.main.views.getDescriptionDetail'),
-    (r'^' + EXTRA_URL + 'getGeoObjects/(?P<category_ids>\w+)/$',
-                'chimere.main.views.getGeoObjects'),
-    (r'^' + EXTRA_URL + 'getGeoObjects/(?P<category_ids>\w+)/(?P<status>\w+)$',
+    (base + r'getGeoObjects/(?P<category_ids>\w+)(/(?P<status>\w+))?$',
                 'chimere.main.views.getGeoObjects'),
-    (r'^' + EXTRA_URL + 'static/(?P<path>.*)$', 'django.views.static.serve',
+    (base + r'getAvailableCategories/(?P<area>\w+)(/(?P<status>\w+))?(/(?P<force>\w+))?$',
+                'chimere.main.views.getAvailableCategories'),
+    (base + r'static/(?P<path>.*)$', 'django.views.static.serve',
                          {'document_root': ROOT_PATH + 'static/'}),
-    (r'^' + EXTRA_URL + 'media/(?P<path>.*)$', 'django.views.static.serve',
+    (base + r'media/(?P<path>.*)$', 'django.views.static.serve',
                           {'document_root': ROOT_PATH + 'media/'}),
-    (r'^' + EXTRA_URL + 'jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict),
+    (base + r'jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict),
 )