summaryrefslogtreecommitdiff
path: root/chimere/urls.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2012-07-03 00:26:00 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2012-07-03 00:26:00 +0200
commit80e38f8925b5f2fdbe3e1bcb8536fb77da27140b (patch)
tree6cda46de6827b50ad59d59d54f359c25cc411f40 /chimere/urls.py
parentf6e4d1156f96be86e6fb8e59655452065e643717 (diff)
downloadChimère-80e38f8925b5f2fdbe3e1bcb8536fb77da27140b.tar.bz2
Chimère-80e38f8925b5f2fdbe3e1bcb8536fb77da27140b.zip
Fix feeds - remove BASE_URL ref
* fix area feeds * fix url feeds * temporary fix: pass Marker from BaseGeoManager to GeoManager to fix a strange error in area feeds using contained filter
Diffstat (limited to 'chimere/urls.py')
-rw-r--r--chimere/urls.py18
1 files changed, 10 insertions, 8 deletions
diff --git a/chimere/urls.py b/chimere/urls.py
index d7596c0..9c1d291 100644
--- a/chimere/urls.py
+++ b/chimere/urls.py
@@ -37,16 +37,18 @@ urlpatterns = patterns('chimere.views',
if settings.CHIMERE_FEEDS:
urlpatterns += patterns('',
- url(r'^(?P<area_name>\w+/)?feeds$', 'chimere.views.rss', name='feeds-form'),
- url(r'^(?P<area_name>\w+/)?feeds/category/(?P<category_id>\d+)$', LatestPOIsByCategory(),
- name='feeds-cat'),
+ url(r'^(?P<area_name>\w+/)?feeds$', 'chimere.views.rss',
+ name='feeds-form'),
+ url(r'^(?P<area_name>\w+/)?feeds/category/(?P<category_id>\d+)$',
+ LatestPOIsByCategory(), name='feeds-cat'),
url(r'^(?P<area_name>\w+/)?feeds/subcategory/(?P<category_id>\d+)$',
LatestPOIsBySubCategory(), name='feeds-subcat'),
- url(r'^(?P<area_name>\w+/)?feeds/global/$', LatestPOIs(), name='feeds-global'),
- url(r'^(?P<area_name>\w+/)?feeds/area/(?P<area>[0-9-_.]+)$', LatestPOIs(),
- name='feeds-area'),
- url(r'^(?P<area_name>\w+/)?feeds/areaid/(?P<area_id>\d+)$', LatestPOIsByZoneID(),
- name='feeds-areaid'),
+ url(r'^(?P<area_name>\w+/)?feeds/global/$', LatestPOIs(),
+ name='feeds-global'),
+ url(r'^(?P<area_name>\w+/)?feeds/area/(?P<area>[0-9-_.]+)$',
+ LatestPOIsByZone(), name='feeds-area'),
+ url(r'^(?P<area_name>\w+/)?feeds/areaid/(?P<area_id>\d+)$',
+ LatestPOIsByZoneID(), name='feeds-areaid'),
)
urlpatterns += patterns('chimere.views',