summaryrefslogtreecommitdiff
path: root/chimere/urls.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-02-22 21:04:43 +0100
committerÉtienne Loks <etienne.loks@proxience.com>2015-02-22 21:04:43 +0100
commit906a299b4c07d4e6f0a31cd6504926cf7ff7cc66 (patch)
tree6f05955d3b12933817813d02a1c7aaa856e3efe7 /chimere/urls.py
parent49a981c28c1c47ee548859f0490fa157acf9b1ba (diff)
parented6c1559c44bdc3214cd2dffb377359601b28a33 (diff)
downloadChimère-906a299b4c07d4e6f0a31cd6504926cf7ff7cc66.tar.bz2
Chimère-906a299b4c07d4e6f0a31cd6504926cf7ff7cc66.zip
Merge branch 'v2.2'
Conflicts: chimere/admin.py chimere/models.py chimere/static/chimere/css/styles.css chimere/urls.py chimere/views.py
Diffstat (limited to 'chimere/urls.py')
-rw-r--r--chimere/urls.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/chimere/urls.py b/chimere/urls.py
index 30ca844..256c08f 100644
--- a/chimere/urls.py
+++ b/chimere/urls.py
@@ -106,6 +106,8 @@ urlpatterns += patterns('chimere.views',
name="getgeoobjects"),
url(r'^(?P<map_name>[a-zA-Z0-9_-]+/)?getAvailableCategories/$',
'get_available_categories', name="get_categories"),
+ url(r'^(?P<map_name>[a-zA-Z0-9_-]+/)?get-marker/'\
+ r'(?P<pk>[0-9]+)$', 'getMarker', name="get-marker"),
url(r'^(?P<map_name>[a-zA-Z0-9_-]+/)?getAllCategories/$',
'get_all_categories', name="get_all_categories"),
url(r'^(?P<map_name>[a-zA-Z0-9_-]+/)?getCategory/(?P<category_id>\d+)/?$',