fix redirect urls for old refs

diff --git a/telemeta/urls.py b/telemeta/urls.py
index 8c4a9ee552b2e9a1ec367e11cb6f6185ebefde0e..3322b325f3bc5c119e641148422914ad319dca0c 100644 (file)
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -36,7 +36,7 @@
 
 from django.conf.urls import patterns, url, include
 from django.conf import settings
-from django.views.generic import RedirectView
+from django.views.generic.base import RedirectView
 from django.views.generic.list import ListView
 from telemeta.models import MediaItem, MediaCollection, MediaItemMarker, MediaCorpus, MediaFonds
 from telemeta.views import *
@@ -94,8 +94,15 @@ urlpatterns = patterns('',
     # Markers
     url(r'^archives/markers/(?P<marker_id>[A-Za-z0-9]+)/$', item_view.item_detail, name="telemeta-item-detail-marker"),
 
-    # FIXME: need all paths
-    url(r'^items/(?P<path>[A-Za-z0-9._-s/]+)/$', RedirectView.as_view(), {'url': '/archives/items/%(path)s/', 'permanent': False}, name="telemeta-item-redir"),
+    # Redirections to old URLs
+    url(r'^items/(?P<path>[A-Za-z0-9._-s/]+)/$', RedirectView.as_view(url='/archives/items/%(path)s/',
+                                                 permanent= True), name="telemeta-item-redir"),
+    url(r'^collections/(?P<path>[A-Za-z0-9._-s/]+)/$', RedirectView.as_view(url='/archives/collections/%(path)s/',
+                                                 permanent= True), name="telemeta-collection-redir"),
+    url(r'^corpus/(?P<path>[A-Za-z0-9._-s/]+)/$', RedirectView.as_view(url='/archives/corpus/%(path)s/',
+                                                 permanent= True), name="telemeta-corpus-redir"),
+    url(r'^fonds/(?P<path>[A-Za-z0-9._-s/]+)/$', RedirectView.as_view(url='/archives/fonds/%(path)s/',
+                                                 permanent= True), name="telemeta-fonds-redir"),
 
     # collections
     url(r'^archives/collections/$', CollectionListView.as_view(), name="telemeta-collections"),

diff --git a/telemeta/views/item.py b/telemeta/views/item.py
index d2c898099101dc3b1c6ca6f05e2b045527eced8a..6088cbeaea1a2167e0d5349a5afb4b067c7dec1f 100644 (file)
--- a/telemeta/views/item.py
+++ b/telemeta/views/item.py
@@ -975,3 +975,4 @@ class ItemDetailView(ItemViewMixin, DetailView):
         context['format'] = format
 
         return context
+