Date: Sun, 15 Dec 2019 12:33:06 +0000 (UTC) From: Kai Knoblich <kai@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r520174 - in branches/2019Q4/net-mgmt/netbox: . files Message-ID: <201912151233.xBFCX6oU023440@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kai Date: Sun Dec 15 12:33:06 2019 New Revision: 520174 URL: https://svnweb.freebsd.org/changeset/ports/520174 Log: 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 Added: branches/2019Q4/net-mgmt/netbox/files/patch-netbox_ipam_tables.py - copied unchanged from r520173, head/net-mgmt/netbox/files/patch-netbox_ipam_tables.py Modified: branches/2019Q4/net-mgmt/netbox/Makefile Directory Properties: branches/2019Q4/ (props changed) Modified: branches/2019Q4/net-mgmt/netbox/Makefile ============================================================================== --- branches/2019Q4/net-mgmt/netbox/Makefile Sun Dec 15 12:32:20 2019 (r520173) +++ branches/2019Q4/net-mgmt/netbox/Makefile Sun Dec 15 12:33:06 2019 (r520174) @@ -3,6 +3,7 @@ PORTNAME= netbox DISTVERSIONPREFIX= v DISTVERSION= 2.6.8 +PORTREVISION= 1 CATEGORIES= net-mgmt MAINTAINER= kai@FreeBSD.org Copied: branches/2019Q4/net-mgmt/netbox/files/patch-netbox_ipam_tables.py (from r520173, head/net-mgmt/netbox/files/patch-netbox_ipam_tables.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q4/net-mgmt/netbox/files/patch-netbox_ipam_tables.py Sun Dec 15 12:33:06 2019 (r520174, copy of r520173, head/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 = """ +-<a href="{% url 'ipam:ipaddress_edit' pk=record.pk %}?interface={{ record.interface.pk }}&return_url={{ request.path }}">{{ record }}</a> ++{% if request.GET %} ++ <a href="{% url 'ipam:ipaddress_edit' pk=record.pk %}?interface={{ request.GET.interface }}&return_url={{ request.GET.return_url }}">{{ record }}</a> ++{% else %} ++ <a href="{% url 'ipam:ipaddress_edit' pk=record.pk %}?interface={{ record.interface.pk }}&return_url={{ request.path }}">{{ record }}</a> ++{% endif %} + """ + + IPADDRESS_PARENT = """
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912151233.xBFCX6oU023440>