add links to revisions templates

diff --git a/telemeta/templates/telemeta_default/home.html b/telemeta/templates/telemeta_default/home.html
index 06dbb8c51dbe2fab92c52f990115572f0b290e02..815f0c46991232dab7a2e7ee6a4f811dbef8c4e1 100644 (file)
--- a/telemeta/templates/telemeta_default/home.html
+++ b/telemeta/templates/telemeta_default/home.html
@@ -79,17 +79,21 @@
     <table class="listing">
      <tr>
         <th class="highlight">Date</th>
-        <th>Element</th>
+        <th>Code</th>
         <th>Type</th>
         <th>Change type</th>
        
     </tr>
-    {% for revision in revisions %}
+    {% for r in revisions %}
     <tr>
-        <td>{{ revision.time }}</td>
-        <td>{{ revision.element_id }}</td>
-        <td>{{ revision.element_type }}</td>
-        <td>{{ revision.change_type }}</td>
+        <td>{{ r.revision.time }}</td>
+        {% if r.revision.type == "item" %}
+         <td><a href="{% url telemeta-item-detail r.element.public_id %}">{{ r.element }}</td>
+        {% else %}
+         <td><a href="{% url telemeta-collection-detail r.element.public_id %}">{{ r.element }}</td>
+            {% endif %}
+        <td>{{ r.revision.element_type }}</td>
+        <td>{{ r.revision.change_type }}</td>
        
     </tr>
     {% endfor %}

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index f3ae8265a507920f170875bf04c4dfa6e78b87e6..08992cd360830675b2bff8669098519ee047dc14 100644 (file)
--- 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)