Deprecated use_obj_view in favor of get_return_url()

netbox/circuits/views.py

@@ -1,6 +1,7 @@
 from django.contrib import messages
 from django.contrib.auth.decorators import permission_required
 from django.contrib.auth.mixins import PermissionRequiredMixin
+from django.core.urlresolvers import reverse
 from django.db import transaction
 from django.db.models import Count
 from django.shortcuts import get_object_or_404, redirect, render
@@ -92,8 +93,9 @@ class CircuitTypeEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'circuits.change_circuittype'
     model = CircuitType
     form_class = forms.CircuitTypeForm
-    obj_list_url = 'circuits:circuittype_list'
-    use_obj_view = False
+
+    def get_return_url(self, obj):
+        return reverse('circuits:circuittype_list')
 
 
 class CircuitTypeBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):

netbox/dcim/views.py

@@ -199,8 +199,9 @@ class RackGroupEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_rackgroup'
     model = RackGroup
     form_class = forms.RackGroupForm
-    obj_list_url = 'dcim:rackgroup_list'
-    use_obj_view = False
+
+    def get_return_url(self, obj):
+        return reverse('dcim:rackgroup_list')
 
 
 class RackGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
@@ -224,8 +225,9 @@ class RackRoleEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_rackrole'
     model = RackRole
     form_class = forms.RackRoleForm
-    obj_list_url = 'dcim:rackrole_list'
-    use_obj_view = False
+
+    def get_return_url(self, obj):
+        return reverse('dcim:rackrole_list')
 
 
 class RackRoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
@@ -318,8 +320,9 @@ class ManufacturerEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_manufacturer'
     model = Manufacturer
     form_class = forms.ManufacturerForm
-    obj_list_url = 'dcim:manufacturer_list'
-    use_obj_view = False
+
+    def get_return_url(self, obj):
+        return reverse('dcim:manufacturer_list')
 
 
 class ManufacturerBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
@@ -537,8 +540,9 @@ class DeviceRoleEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_devicerole'
     model = DeviceRole
     form_class = forms.DeviceRoleForm
-    obj_list_url = 'dcim:devicerole_list'
-    use_obj_view = False
+
+    def get_return_url(self, obj):
+        return reverse('dcim:devicerole_list')
 
 
 class DeviceRoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
@@ -562,8 +566,9 @@ class PlatformEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'dcim.change_platform'
     model = Platform
     form_class = forms.PlatformForm
-    obj_list_url = 'dcim:platform_list'
-    use_obj_view = False
+
+    def get_return_url(self, obj):
+        return reverse('dcim:platform_list')
 
 
 class PlatformBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):

netbox/ipam/views.py

@@ -242,8 +242,9 @@ class RIREditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'ipam.change_rir'
     model = RIR
     form_class = forms.RIRForm
-    obj_list_url = 'ipam:rir_list'
-    use_obj_view = False
+
+    def get_return_url(self, obj):
+        return reverse('ipam:rir_list')
 
 
 class RIRBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
@@ -353,8 +354,9 @@ class RoleEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'ipam.change_role'
     model = Role
     form_class = forms.RoleForm
-    obj_list_url = 'ipam:role_list'
-    use_obj_view = False
+
+    def get_return_url(self, obj):
+        return reverse('ipam:role_list')
 
 
 class RoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
@@ -674,8 +676,9 @@ class VLANGroupEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'ipam.change_vlangroup'
     model = VLANGroup
     form_class = forms.VLANGroupForm
-    obj_list_url = 'ipam:vlangroup_list'
-    use_obj_view = False
+
+    def get_return_url(self, obj):
+        return reverse('ipam:vlangroup_list')
 
 
 class VLANGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):

netbox/secrets/views.py

@@ -30,8 +30,9 @@ class SecretRoleEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'secrets.change_secretrole'
     model = SecretRole
     form_class = forms.SecretRoleForm
-    obj_list_url = 'secrets:secretrole_list'
-    use_obj_view = False
+
+    def get_return_url(self, obj):
+        return reverse('secrets:secretrole_list')
 
 
 class SecretRoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):

netbox/tenancy/views.py

@@ -1,4 +1,5 @@
 from django.contrib.auth.mixins import PermissionRequiredMixin
+from django.core.urlresolvers import reverse
 from django.db.models import Count, Q
 from django.shortcuts import get_object_or_404, render
 
@@ -28,8 +29,9 @@ class TenantGroupEditView(PermissionRequiredMixin, ObjectEditView):
     permission_required = 'tenancy.change_tenantgroup'
     model = TenantGroup
     form_class = forms.TenantGroupForm
-    obj_list_url = 'tenancy:tenantgroup_list'
-    use_obj_view = False
+
+    def get_return_url(self, obj):
+        return reverse('tenancy:tenantgroup_list')
 
 
 class TenantGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):

netbox/utilities/views.py

@@ -127,15 +127,12 @@ class ObjectEditView(View):
     fields_initial: A set of fields that will be prepopulated in the form from the request parameters
     template_name: The name of the template
     obj_list_url: The name of the URL used to display a list of this object type
-    use_obj_view: If True, the user will be directed to a view of the object after it has been edited. Otherwise, the
-                  user will be directed to the object's list view (defined as `obj_list_url`).
     """
     model = None
     form_class = None
     fields_initial = []
     template_name = 'utilities/obj_edit.html'
     obj_list_url = None
-    use_obj_view = True
 
     def get_object(self, kwargs):
         # Look up object by slug or PK. Return None if neither was provided.
@@ -152,7 +149,7 @@ class ObjectEditView(View):
 
     def get_return_url(self, obj):
         # Determine where to redirect the user after updating an object (or aborting an update).
-        if obj.pk and self.use_obj_view and hasattr(obj, 'get_absolute_url'):
+        if obj.pk and hasattr(obj, 'get_absolute_url'):
             return obj.get_absolute_url()
         if self.obj_list_url is not None:
             return reverse(self.obj_list_url)