From 9420479949bfb3d2af4a44b9ecaf4492db99049c Mon Sep 17 00:00:00 2001 From: yomguy Date: Mon, 14 Mar 2011 22:05:32 +0100 Subject: [PATCH] add links to revisions templates --- telemeta/templates/telemeta_default/home.html | 16 ++++++++++------ telemeta/web/base.py | 13 ++++++++++++- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/telemeta/templates/telemeta_default/home.html b/telemeta/templates/telemeta_default/home.html index 06dbb8c5..815f0c46 100644 --- a/telemeta/templates/telemeta_default/home.html +++ b/telemeta/templates/telemeta_default/home.html @@ -79,17 +79,21 @@ - + - {% for revision in revisions %} + {% for r in revisions %} - - - - + + {% if r.revision.type == "item" %} + + {% else %} + + {% endif %} + + {% endfor %} diff --git a/telemeta/web/base.py b/telemeta/web/base.py index f3ae8265..08992cd3 100644 --- a/telemeta/web/base.py +++ b/telemeta/web/base.py @@ -114,6 +114,7 @@ class WebView(object): return HttpResponse(template.render(context)) else: template='telemeta/home.html' + user_playlists = Playlist.objects.filter(owner_username=request.user) playlists = [] for playlist in user_playlists: @@ -127,8 +128,17 @@ class WebView(object): resources.append({'element': element, 'type': resource.resource_type}) playlists.append({'name': playlist.name, 'resources': resources}) + last_revisions = Revision.objects.all().order_by('-time')[0:10] + revisions = [] + for revision in last_revisions: + if revision.element_type == 'item': + element = MediaItem.objects.get(pk=revision.element_id) + if revision.element_type == 'collection': + element = MediaCollection.objects.get(pk=revision.element_id) + revisions.append({'revision': revision, 'element': element}) + searches = Search.objects.filter(username=request.user) - revisions = Revision.objects.all().order_by('-time')[0:10] + return render(request, template, {'playlists': playlists, 'searches': searches, 'revisions': revisions}) def collection_detail(self, request, public_id, template='telemeta/collection_detail.html'): @@ -292,6 +302,7 @@ class WebView(object): form = MediaItemForm(data=request.POST, files=request.FILES, instance=new_item) if form.is_valid(): form.save() + item.set_revision(request.user) return HttpResponseRedirect('/items/'+form.cleaned_data['code']) else: form = MediaItemForm(instance=item) -- 2.39.5
DateElementCode Type Change type
{{ revision.time }}{{ revision.element_id }}{{ revision.element_type }}{{ revision.change_type }}{{ r.revision.time }}{{ r.element }}{{ r.element }}{{ r.revision.element_type }}{{ r.revision.change_type }}