add resource deletion

diff --git a/telemeta/templates/telemeta/resource_detail.html b/telemeta/templates/telemeta/resource_detail.html
index 3ffb30d198518f7c1cd9c2f007f261d036c05542..a16b1c3c5b80b21ce900ba450901ea047cf566dc 100644 (file)
--- a/telemeta/templates/telemeta/resource_detail.html
+++ b/telemeta/templates/telemeta/resource_detail.html
@@ -100,8 +100,7 @@ jQuery(document).ready(function(){
 {% block delete %}
 <a href="{% url "telemeta-resource-dublincore" type resource.public_id %}" style="float:left;margin-top:0.5em;margin-bottom:1em" class="component_icon button icon_dublin_core">Dublin Core</a>
 {% if user.is_authenticated and perms.telemeta.delete_mediaresource %}
- <a href="#" onclick="if(confirm(gettrans('delete the resource permanently?'))){window.location.href='{% url "telemeta-resource-delete" type resource.public_id %}';};return false;"
-        class="component_icon button icon_delete" style="float:right;margin-top:0.5em;margin-bottom:1em">{% trans "Delete" %}</a>
+ <a href="{% url "telemeta-resource-delete" type resource.public_id %}" class="component_icon button icon_delete" style="float:right;margin-top:0.5em;margin-bottom:1em">{% trans "Delete" %}</a>
 {% endif %}
 {% endblock %}
 

diff --git a/telemeta/urls.py b/telemeta/urls.py
index f1ae3add7bf9521deec17a684ef0f324a6af51d5..363e5c38df07e84e1b4d576ce825048f353e634c 100644 (file)
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -163,13 +163,10 @@ urlpatterns = patterns('',
     url(r'^archives/(?P<type>[A-Za-z0-9._-]+)/(?P<public_id>[A-Za-z0-9._-]+)/edit/$', ResourceEditView.as_view(), name="telemeta-resource-edit"),
     url(r'^archives/(?P<type>[A-Za-z0-9._-]+)/(?P<public_id>[A-Za-z0-9._-]+)/copy/$', ResourceCopyView.as_view(), name="telemeta-resource-copy"),
     url(r'^archives/(?P<type>[A-Za-z0-9._-]+)_add$', ResourceAddView.as_view(), name="telemeta-resource-add"),
-    url(r'^archives/(?P<type>[A-Za-z0-9._-]+)/(?P<public_id>[A-Za-z0-9._-]+)/delete/$', resource_view.delete, name="telemeta-resource-delete"),
+    url(r'^archives/(?P<type>[A-Za-z0-9._-]+)/(?P<public_id>[A-Za-z0-9._-]+)/delete/$', ResourceDeleteView.as_view(), name="telemeta-resource-delete"),
     url(r'^archives/(?P<type>[A-Za-z0-9._-]+)/(?P<public_id>[A-Za-z0-9._-]+)/related/(?P<media_id>[A-Za-z0-9._-]+)/view/$', resource_view.related_stream, name="telemeta-resource-related"),
     url(r'^archives/(?P<type>[A-Za-z0-9._-]+)/(?P<public_id>[A-Za-z0-9._-]+)/related/(?P<media_id>[A-Za-z0-9._-]+)/download/$', resource_view.related_download, name="telemeta-resource-related-download"),
     url(r'^archives/(?P<type>[A-Za-z0-9._-]+)/(?P<public_id>[A-Za-z0-9._-]+)/related_edit/$', resource_view.related_edit,  dict(template='telemeta/resource_related_edit.html'), name="telemeta-resource-related_edit"),
-    url(r'^archives/(?P<type>[A-Za-z0-9._-]+)/(?P<public_id>[A-Za-z0-9._-]+)/dc/$', resource_view.detail,
-        {'template': 'telemeta/resource_detail_dc.html'},
-        name="telemeta-resource-dublincore"),
     url(r'^archives/(?P<type>[A-Za-z0-9._-]+)/(?P<public_id>[A-Za-z0-9._-]+)/dc/xml/$', resource_view.detail,
         {'format': 'dublin_core_xml'},
         name="telemeta-resource-dublincore-xml"),

diff --git a/telemeta/views/resource.py b/telemeta/views/resource.py
index 4479f669ab11b557c9e2e12ad7c688cdbdd15a64..00c05eaa1a91fe6f4c47bb56a96f8435fc1372fc 100644 (file)
--- a/telemeta/views/resource.py
+++ b/telemeta/views/resource.py
@@ -38,6 +38,7 @@
 from telemeta.views.core import *
 from django.utils.translation import ugettext_lazy as _
 from django.forms.models import model_to_dict
+from django.views.generic.edit import DeletionMixin, BaseDeleteView
 
 
 class ResourceView(object):
@@ -329,3 +330,11 @@ class ResourceCopyView(ResourceSingleMixin, ResourceAddView):
         return reverse_lazy('telemeta-resource-list', kwargs={'type':self.kwargs['type']})
         # return reverse_lazy('telemeta-resource-detail', kwargs={'type':self.kwargs['type'], 'public_id':self.kwargs['public_id']})
 
+
+class ResourceDeleteView(ResourceSingleMixin, DeleteView):
+
+    template_name = 'telemeta/resource_confirm_delete.html'
+
+    def get_success_url(self):
+         return reverse_lazy('telemeta-resource-list', kwargs={'type':self.kwargs['type']})
+