From dd0b16bff5ec4335e2db7803cf017f27ccf07c23 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Mon, 10 Jan 2022 15:26:01 -0500 Subject: [PATCH] Fixes #8305: Fix assignment of custom field data to FHRP groups via UI --- docs/release-notes/version-3.1.md | 1 + netbox/ipam/forms/models.py | 2 ++ netbox/ipam/tables/fhrp.py | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index 0b3945119..e822a581b 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -14,6 +14,7 @@ * [#8285](https://github.com/netbox-community/netbox/issues/8285) - Fix `cluster_count` under tenant REST API serializer * [#8287](https://github.com/netbox-community/netbox/issues/8287) - Correct label in export template form * [#8301](https://github.com/netbox-community/netbox/issues/8301) - Fix delete button for various object children views +* [#8305](https://github.com/netbox-community/netbox/issues/8305) - Fix assignment of custom field data to FHRP groups via UI * [#8306](https://github.com/netbox-community/netbox/issues/8306) - Redirect user to previous page after login --- diff --git a/netbox/ipam/forms/models.py b/netbox/ipam/forms/models.py index 4ed8aa267..08138f4fe 100644 --- a/netbox/ipam/forms/models.py +++ b/netbox/ipam/forms/models.py @@ -592,6 +592,8 @@ class FHRPGroupForm(CustomFieldModelForm): return instance def clean(self): + super().clean() + ip_vrf = self.cleaned_data.get('ip_vrf') ip_address = self.cleaned_data.get('ip_address') ip_status = self.cleaned_data.get('ip_status') diff --git a/netbox/ipam/tables/fhrp.py b/netbox/ipam/tables/fhrp.py index 94bc50b93..766345e49 100644 --- a/netbox/ipam/tables/fhrp.py +++ b/netbox/ipam/tables/fhrp.py @@ -60,7 +60,7 @@ class FHRPGroupAssignmentTable(BaseTable): ) actions = ButtonsColumn( model=FHRPGroupAssignment, - buttons=('edit', 'delete', 'foo') + buttons=('edit', 'delete') ) class Meta(BaseTable.Meta):