add method and button to delete an item

diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html
index 22855d0da29d728b0748385041ab27befd8b4111..9e52840af8d37e3afeab2684508384fdc773b756 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -258,6 +258,9 @@
     </div>
     {% endblock infos %}
 </div> <!-- with-rightcol -->
+<div style="float: right;">
+ <a href="{% url telemeta-item-delete item.public_id %}" class="component_icon button icon_cancel">{% trans "Delete" %}</a>
+</div>
 {% endblock %}
 {% else %}
 <p>No such item</p>

diff --git a/telemeta/urls.py b/telemeta/urls.py
index fa537954e511a0539f7e16ac52bb5f0a3dac4e0d..f7f7cf986be3e7ed94290f4f02bc805f697e73df 100644 (file)
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -101,6 +101,7 @@ urlpatterns = patterns('',
         dict(template='telemeta/mediaitem_performances_edit.html'), name="telemeta-item-performances_edit"),
     url(r'^items/(?P<public_id>[A-Za-z0-9._-]+)/keywords/$', web_view.item_keywords_edit,
         dict(template='telemeta/mediaitem_keywords_edit.html'), name="telemeta-item-keywords_edit"),
+    url(r'^items/(?P<public_id>[A-Za-z0-9._-]+)/delete/$', web_view.item_delete, name="telemeta-item-delete"),
         
     # Markers
     url(r'^markers/(?P<marker_id>[A-Za-z0-9]+)/$', web_view.item_detail, name="telemeta-item-detail-marker"),

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 81aef0fa534e36787db6a0122355653191bc974a..799508c7de9fd32b6c3db9845ce6b50ff0eccaac 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -305,7 +305,7 @@ class WebView(object):
         
     @method_decorator(permission_required('telemeta.change_mediaitem'))
     def item_edit(self, request, public_id, template='telemeta/mediaitem_edit.html'):
-        """Show the details of a given item"""
+        """Edit a given item"""
         item = MediaItem.objects.get(public_id=public_id)
         
         formats = []
@@ -350,7 +350,7 @@ class WebView(object):
         
     @method_decorator(permission_required('telemeta.add_mediaitem'))
     def item_add(self, request, public_id=None, template='telemeta/mediaitem_add.html'):
-        """Show the details of a given item"""
+        """Add an item"""
         if public_id:
             collection = MediaCollection.objects.get(public_id=public_id)
             item = MediaItem(collection=collection)
@@ -372,7 +372,7 @@ class WebView(object):
     
     @method_decorator(permission_required('telemeta.add_mediaitem'))
     def item_copy(self, request, public_id, template='telemeta/mediaitem_copy.html'):
-        """Show the details of a given item"""        
+        """Copy a given item"""        
         if request.method == 'POST':
             new_item = MediaItem()
             form = MediaItemForm(data=request.POST, files=request.FILES, instance=new_item)
@@ -389,6 +389,14 @@ class WebView(object):
             form.file = None
         
         return render(request, template, {'item': item, "form": form})
+       
+    @method_decorator(permission_required('telemeta.delete_mediaitem'))
+    def item_delete(self, request, public_id):
+        """Delete a given item"""
+        item = MediaItem.objects.get(public_id=public_id)
+        collection = item.collection
+        item.delete()
+        return HttpResponseRedirect('/collections/'+collection.code)
         
     def item_analyze(self, item):
         analyses = MediaItemAnalysis.objects.filter(item=item)