From 7918f85cdd0472a37cf8a16d545cb68201d112fb Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 27 Jun 2016 23:08:30 -0400 Subject: [PATCH 1/2] Corrected rack height validation to exclude 0U devices --- netbox/dcim/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 0c587dd3d..b6ec28be2 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -187,7 +187,7 @@ class Rack(CreatedUpdatedModel): # Validate that Rack is tall enough to house the installed Devices if self.pk: - top_device = Device.objects.filter(rack=self).order_by('-position').first() + top_device = Device.objects.filter(rack=self).exclude(position__isnull=True).order_by('-position').first() if top_device: min_height = top_device.position + top_device.device_type.u_height - 1 if self.u_height < min_height: From 4e5f537cc5f8f1d12c28c14de29d38296c4bef74 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 27 Jun 2016 23:18:26 -0400 Subject: [PATCH 2/2] When editing an object, cancel_url should point to its normal view; when adding, it should point to the object list --- netbox/utilities/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py index e1611a7ac..671390060 100644 --- a/netbox/utilities/views.py +++ b/netbox/utilities/views.py @@ -120,7 +120,7 @@ class ObjectEditView(View): 'obj': obj, 'obj_type': self.model._meta.verbose_name, 'form': form, - 'cancel_url': reverse(self.cancel_url) if self.cancel_url else obj.get_absolute_url(), + 'cancel_url': obj.get_absolute_url() if obj else reverse(self.cancel_url), }) def post(self, request, *args, **kwargs): @@ -157,7 +157,7 @@ class ObjectEditView(View): 'obj': obj, 'obj_type': self.model._meta.verbose_name, 'form': form, - 'cancel_url': reverse(self.cancel_url) if self.cancel_url else obj.get_absolute_url(), + 'cancel_url': obj.get_absolute_url() if obj else reverse(self.cancel_url), })