mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

#4624: Refactor ObjectDeleteView to use a queryset

Browse Source
This commit is contained in:
Jeremy Stretch
2020-05-11 12:47:01 -04:00
parent 87fa6bc252
commit 3abb52a085
8 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
netbox/utilities/views.py
View File

@@ -216,7 +216,7 @@ class ObjectEditView(GetReturnURLMixin, View):
"""
Create or edit a single object.
queryset: The base queryset for the model being modified
queryset: The base queryset for the object being modified
model_form: The form used to create or edit the object
template_name: The name of the template
"""
@@ -304,18 +304,18 @@ class ObjectDeleteView(GetReturnURLMixin, View):
"""
Delete a single object.
model: The model of the object being deleted
queryset: The base queryset for the object being deleted
template_name: The name of the template
"""
model = None
queryset = None
template_name = 'utilities/obj_delete.html'
def get_object(self, kwargs):
# Look up object by slug if one has been provided. Otherwise, use PK.
if 'slug' in kwargs:
return get_object_or_404(self.model, slug=kwargs['slug'])
return get_object_or_404(self.queryset, slug=kwargs['slug'])
else:
return get_object_or_404(self.model, pk=kwargs['pk'])
return get_object_or_404(self.queryset, pk=kwargs['pk'])
def get(self, request, **kwargs):
obj = self.get_object(kwargs)
@@ -324,7 +324,7 @@ class ObjectDeleteView(GetReturnURLMixin, View):
return render(request, self.template_name, {
'obj': obj,
'form': form,
'obj_type': self.model._meta.verbose_name,
'obj_type': self.queryset.model._meta.verbose_name,
'return_url': self.get_return_url(request, obj),
})
@@ -343,7 +343,7 @@ class ObjectDeleteView(GetReturnURLMixin, View):
handle_protectederror(obj, request, e)
return redirect(obj.get_absolute_url())
msg = 'Deleted {} {}'.format(self.model._meta.verbose_name, obj)
msg = 'Deleted {} {}'.format(self.queryset.model._meta.verbose_name, obj)
logger.info(msg)
messages.success(request, msg)
@@ -359,7 +359,7 @@ class ObjectDeleteView(GetReturnURLMixin, View):
return render(request, self.template_name, {
'obj': obj,
'form': form,
'obj_type': self.model._meta.verbose_name,
'obj_type': self.queryset.model._meta.verbose_name,
'return_url': self.get_return_url(request, obj),
})