Merge branch 'develop' into develop-2.10

netbox/dcim/choices.py

@@ -856,6 +856,7 @@ class PortTypeChoices(ChoiceSet):
     TYPE_MPO = 'mpo'
     TYPE_LSH = 'lsh'
     TYPE_LSH_APC = 'lsh-apc'
+    TYPE_SPLICE = 'splice'
 
     CHOICES = (
         (
@@ -883,6 +884,7 @@ class PortTypeChoices(ChoiceSet):
                 (TYPE_SC, 'SC'),
                 (TYPE_SC_APC, 'SC/APC'),
                 (TYPE_ST, 'ST'),
+                (TYPE_SPLICE, 'Splice'),
             )
         )
     )

netbox/dcim/forms.py

@@ -741,7 +741,7 @@ class RackReservationForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
         display_field='display_name',
         query_params={
             'site_id': '$site',
-            'group_id': '$rack',
+            'group_id': '$rack_group',
         }
     )
     units = NumericArrayField(