From 1dcf462376d18004481c8df2c21ea29762ba6747 Mon Sep 17 00:00:00 2001
From: Alice <alice@packetimpact.net>
Date: Sun, 19 Jul 2020 22:50:28 +0200
Subject: [PATCH] a few admin fixes

---
 lambdainst/admin.py                    | 2 +-
 lambdainst/views.py                    | 4 ++--
 templates/admin/index.html             | 2 +-
 templates/lambdainst/admin_status.html | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lambdainst/admin.py b/lambdainst/admin.py
index be091d0..4428a81 100644
--- a/lambdainst/admin.py
+++ b/lambdainst/admin.py
@@ -73,7 +73,7 @@ class GiftCodeUserAdmin(admin.TabularInline):
         return format_html('<a href="{}">{}</a>', change_url, object.code.code)
     code_link.short_description = 'Code'
 
-    def has_add_permission(self, request):
+    def has_add_permission(self, request, obj):
         return False
 
     def has_delete_permission(self, request, obj=None):
diff --git a/lambdainst/views.py b/lambdainst/views.py
index f076aeb..6c3bf5e 100644
--- a/lambdainst/views.py
+++ b/lambdainst/views.py
@@ -250,8 +250,8 @@ def make_export_zip(user, name):
             gw = django_lcore.api.get(gw_url)
             gw_cache[gw_url] = {
                 "name": gw["name"],
-                "ipv4": gw["main_ipv4"],
-                "ipv6": gw["main_ipv6"],
+                "ipv4": gw["main_addr"]["ipv4"],
+                "ipv6": gw["main_addr"]["ipv6"],
             }
         obj["gateway"] = gw_cache[gw_url]
         return obj
diff --git a/templates/admin/index.html b/templates/admin/index.html
index 0c3a7c9..7da2824 100644
--- a/templates/admin/index.html
+++ b/templates/admin/index.html
@@ -1,5 +1,5 @@
 {% extends "admin/base_site.html" %}
-{% load i18n admin_static %}
+{% load i18n static %}
 
 {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/dashboard.css" %}" />{% endblock %}
 
diff --git a/templates/lambdainst/admin_status.html b/templates/lambdainst/admin_status.html
index ff36ef5..41515e7 100644
--- a/templates/lambdainst/admin_status.html
+++ b/templates/lambdainst/admin_status.html
@@ -1,5 +1,5 @@
 {% extends "admin/base_site.html" %}
-{% load i18n admin_static %}
+{% load i18n static %}
 
 {% block extrastyle %}{{ block.super }}
 <link rel="stylesheet" type="text/css" href="{% static "admin/css/dashboard.css" %}" />