diff --git a/apps/assets/templates/assets/label_list.html b/apps/assets/templates/assets/label_list.html
index b9430bb97..ebefb243a 100644
--- a/apps/assets/templates/assets/label_list.html
+++ b/apps/assets/templates/assets/label_list.html
@@ -36,7 +36,7 @@ function initTable() {
{targets: 4, createdCell: function (td, cellData, rowData) {
var update_btn = '{% trans "Update" %}'.replace('{{ DEFAULT_PK }}', cellData);
- var del_btn = '{% trans "Delete" %}'.replace('{{ DEFAULT_PK }}', cellData);
+ var del_btn = '{% trans "Delete" %}'.replace('{{ DEFAULT_PK }}', cellData);
$(td).html(update_btn + del_btn)
}}],
ajax_url: '{% url "api-assets:label-list" %}?sort=name',
@@ -51,12 +51,12 @@ function initTable() {
$(document).ready(function(){
initTable();
})
-.on('click', '.btn_cluster_delete', function () {
+.on('click', '.btn-delete', function () {
var $this = $(this);
- var $data_table = $('#cluster_list_table').DataTable();
+ var $data_table = $('#label_list_table').DataTable();
var name = $(this).closest("tr").find(":nth-child(2)").children('a').html();
var uid = $this.data('uid');
- var the_url = '{% url "api-assets:cluster-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid);
+ var the_url = '{% url "api-assets:label-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid);
objectDelete($this, name, the_url);
setTimeout( function () {
$data_table.ajax.reload();
diff --git a/apps/assets/urls/views_urls.py b/apps/assets/urls/views_urls.py
index 6207ae0c5..48d01dafd 100644
--- a/apps/assets/urls/views_urls.py
+++ b/apps/assets/urls/views_urls.py
@@ -56,5 +56,6 @@ urlpatterns = [
url(r'^label/$', views.LabelListView.as_view(), name='label-list'),
url(r'^label/create/$', views.LabelCreateView.as_view(), name='label-create'),
url(r'^label/(?P[0-9a-zA-Z\-]{36})/update/$', views.LabelUpdateView.as_view(), name='label-update'),
+ url(r'^label/(?P[0-9a-zA-Z\-]{36})/delete/$', views.LabelDeleteView.as_view(), name='label-delete'),
]
diff --git a/apps/assets/views/label.py b/apps/assets/views/label.py
index a6e1d3aa3..0b2d0d6ad 100644
--- a/apps/assets/views/label.py
+++ b/apps/assets/views/label.py
@@ -67,4 +67,6 @@ class LabelDetailView(AdminUserRequiredMixin, DetailView):
class LabelDeleteView(AdminUserRequiredMixin, DeleteView):
- pass
+ model = Label
+ template_name = 'delete_confirm.html'
+ success_url = reverse_lazy('assets:label-list')