From 1d1cb867cd0fbded359421143213f2edfa020c60 Mon Sep 17 00:00:00 2001
From: kobayashi <abok.1k@gmail.com>
Date: Fri, 13 Dec 2019 14:24:11 -0500
Subject: [PATCH] fix 3679

---
 docs/release-notes/version-2.6.md | 1 +
 netbox/ipam/tables.py             | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/version-2.6.md b/docs/release-notes/version-2.6.md
index 5a64ceb9e..538474912 100644
--- a/docs/release-notes/version-2.6.md
+++ b/docs/release-notes/version-2.6.md
@@ -9,6 +9,7 @@
 
 * [#2170](https://github.com/netbox-community/netbox/issues/2170) - Prevent the deletion of a virtual chassis when a cross-member LAG is present
 * [#3749](https://github.com/netbox-community/netbox/issues/3749) - Fix exception on password change page for local users
+* [#3757](https://github.com/netbox-community/netbox/issues/3757) - Fix unable to assign IP to interface
 
 # v2.6.8 (2019-12-10)
 
diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py
index 91f195ba0..e4d2bf8b4 100644
--- a/netbox/ipam/tables.py
+++ b/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 = """