From ddc515173f397f10cad0c9c6e6dc8fcd38a4823d Mon Sep 17 00:00:00 2001 From: Kai Knoblich Date: Sun, 15 Dec 2019 12:33:06 +0000 Subject: MFH: r520173 net-mgmt/netbox: Fix assignment of IP addresses to interfaces * Backport a patch from upstream's repository which fixes the assignment of existing IP addresses to interfaces. Without that patch the assignment of an IP address gives no error but the interface doesn't contain the assigned IP address at the end. * Bump PORTREVISION for package change. Approved by: ports-secteam bugfix blanket --- net-mgmt/netbox/Makefile | 1 + net-mgmt/netbox/files/patch-netbox_ipam_tables.py | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 net-mgmt/netbox/files/patch-netbox_ipam_tables.py diff --git a/net-mgmt/netbox/Makefile b/net-mgmt/netbox/Makefile index da62903a1768..012dc7956ded 100644 --- a/net-mgmt/netbox/Makefile +++ b/net-mgmt/netbox/Makefile @@ -3,6 +3,7 @@ PORTNAME= netbox DISTVERSIONPREFIX= v DISTVERSION= 2.6.8 +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= kai@FreeBSD.org diff --git a/net-mgmt/netbox/files/patch-netbox_ipam_tables.py b/net-mgmt/netbox/files/patch-netbox_ipam_tables.py new file mode 100644 index 000000000000..616ff4000e09 --- /dev/null +++ b/net-mgmt/netbox/files/patch-netbox_ipam_tables.py @@ -0,0 +1,20 @@ +Fix unable to assign existing IP addresses to interfaces + +Obtained from: +https://github.com/netbox-community/netbox/commit/1acdf58a4bb35d83a280464ac69aa961ff614df7 + +--- netbox/ipam/tables.py.orig 2019-12-15 11:43:12 UTC ++++ netbox/ipam/tables.py +@@ -85,7 +85,11 @@ IPADDRESS_LINK = """ + """ + + IPADDRESS_ASSIGN_LINK = """ +-{{ record }} ++{% if request.GET %} ++ {{ record }} ++{% else %} ++ {{ record }} ++{% endif %} + """ + + IPADDRESS_PARENT = """ -- cgit v1.2.3