From 8b05dbceadae179748af9444a5b0d3b859c91886 Mon Sep 17 00:00:00 2001 From: Nicholas Totsch Date: Tue, 31 Oct 2017 14:28:33 -0500 Subject: [PATCH] Moved migration for update from #1666 and fixed tenant enumeration in FilterForm --- netbox/dcim/forms.py | 2 +- ...rackreservation_tenant.py => 0050_rackreservation_tenant.py} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename netbox/dcim/migrations/{0049_rackreservation_tenant.py => 0050_rackreservation_tenant.py} (100%) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 3e75b65a9..bcdcc0c4c 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -410,7 +410,7 @@ class RackReservationFilterForm(BootstrapMixin, forms.Form): null_option=(0, 'None') ) tenant = FilterChoiceField( - queryset=Tenant.objects.annotate(filter_count=Count('racks__reservations')), + queryset=Tenant.objects.annotate(filter_count=Count('rackreservations')), to_field_name='slug', null_option=(0, 'None') ) diff --git a/netbox/dcim/migrations/0049_rackreservation_tenant.py b/netbox/dcim/migrations/0050_rackreservation_tenant.py similarity index 100% rename from netbox/dcim/migrations/0049_rackreservation_tenant.py rename to netbox/dcim/migrations/0050_rackreservation_tenant.py