From db98590b1b0a847bb4303fd6b9866d062412a9a3 Mon Sep 17 00:00:00 2001 From: yomguy Date: Mon, 1 Oct 2012 15:02:51 +0200 Subject: [PATCH] fix more redirects --- telemeta/urls.py | 1 + telemeta/views/collection.py | 10 +++++----- telemeta/views/item.py | 2 +- telemeta/views/profile.py | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/telemeta/urls.py b/telemeta/urls.py index 8dab15e3..85d16ca7 100644 --- a/telemeta/urls.py +++ b/telemeta/urls.py @@ -170,6 +170,7 @@ urlpatterns = patterns('', # Corpus list url(r'^archives/corpus/$', 'django.views.generic.list_detail.object_list', dict(all_corpus, paginate_by=20, template_name="telemeta/resource_list.html", extra_context={'type':'corpus'}), name="telemeta-corpus"), + # Fonds list url(r'^archives/fonds/$', 'django.views.generic.list_detail.object_list', dict(all_fonds, paginate_by=20, template_name="telemeta/resource_list.html", extra_context={'type':'fonds'}), name="telemeta-fonds"), diff --git a/telemeta/views/collection.py b/telemeta/views/collection.py index de2677fa..7fb0def4 100644 --- a/telemeta/views/collection.py +++ b/telemeta/views/collection.py @@ -81,7 +81,7 @@ class CollectionView(object): code = public_id form.save() collection.set_revision(request.user) - return HttpResponseRedirect('/archives/collections/'+code) + return redirect('telemeta-collection-detail', code) else: form = MediaCollectionForm(instance=collection) @@ -98,7 +98,7 @@ class CollectionView(object): code = public_id form.save() collection.set_revision(request.user) - return HttpResponseRedirect('/archives/collections/'+code) + return redirect('telemeta-collection-detail', code) else: form = MediaCollectionForm(instance=collection) @@ -115,7 +115,7 @@ class CollectionView(object): code = public_id form.save() collection.set_revision(request.user) - return HttpResponseRedirect('/archives/collections/'+code) + return redirect('telemeta-collection-detail', code) else: collection = MediaCollection.objects.get(public_id=public_id) form = MediaCollectionForm(instance=collection) @@ -137,7 +137,7 @@ class CollectionView(object): """Delete a given collection""" collection = MediaCollection.objects.get(public_id=public_id) collection.delete() - return HttpResponseRedirect('/archives/collections/') + return redirect('telemeta-collections') def related_media_collection_stream(self, request, collection_public_id, media_id): collection = MediaCollection.objects.get(public_id=collection_public_id) @@ -155,7 +155,7 @@ class CollectionView(object): if formset.is_valid(): formset.save() collection.set_revision(request.user) - return HttpResponseRedirect('/archives/collections/'+public_id) + return redirect('telemeta-collection-edit', public_id) else: formset = MediaCollectionRelatedFormSet(instance=collection) diff --git a/telemeta/views/item.py b/telemeta/views/item.py index 116a4358..f212972e 100644 --- a/telemeta/views/item.py +++ b/telemeta/views/item.py @@ -230,7 +230,7 @@ class ItemView(object): if formset.is_valid(): formset.save() item.set_revision(request.user) - return redirect('telemeta-item-edit', item.public_id) + return redirect('telemeta-item-edit', public_id) else: formset = MediaItemRelatedFormSet(instance=item) diff --git a/telemeta/views/profile.py b/telemeta/views/profile.py index 322ece81..8cdfd32c 100644 --- a/telemeta/views/profile.py +++ b/telemeta/views/profile.py @@ -82,7 +82,7 @@ class ProfileView(object): if user_form.is_valid() and profile_form.is_valid(): user_form.save() profile_form.save() - return HttpResponseRedirect('/accounts/'+username+'/profile/') + return redirect('telemeta-desk-profile', username) else: user_form = UserChangeForm(instance=user, prefix='user') profile_form = UserProfileForm(instance=profile, prefix='profile') -- 2.39.5