svn commit: r520173 - in head/net-mgmt/netbox: . files
Kai Knoblich
kai at FreeBSD.org
Sun Dec 15 12:32:21 UTC 2019
Author: kai
Date: Sun Dec 15 12:32:20 2019
New Revision: 520173
URL: https://svnweb.freebsd.org/changeset/ports/520173
Log:
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.
MFH: 2019Q4 (blanket: bugfix)
Added:
head/net-mgmt/netbox/files/patch-netbox_ipam_tables.py (contents, props changed)
Modified:
head/net-mgmt/netbox/Makefile
Modified: head/net-mgmt/netbox/Makefile
==============================================================================
--- head/net-mgmt/netbox/Makefile Sun Dec 15 11:39:43 2019 (r520172)
+++ head/net-mgmt/netbox/Makefile Sun Dec 15 12:32:20 2019 (r520173)
@@ -3,6 +3,7 @@
PORTNAME= netbox
DISTVERSIONPREFIX= v
DISTVERSION= 2.6.8
+PORTREVISION= 1
CATEGORIES= net-mgmt
MAINTAINER= kai at FreeBSD.org
Added: head/net-mgmt/netbox/files/patch-netbox_ipam_tables.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-mgmt/netbox/files/patch-netbox_ipam_tables.py Sun Dec 15 12:32:20 2019 (r520173)
@@ -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 = """
More information about the svn-ports-head
mailing list