From 0a71c63583d786c32e01ed5fb5c3aa18bddf3218 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 2 Nov 2018 14:42:15 -0400 Subject: [PATCH] Upgraded to Django 2.1 --- netbox/ipam/fields.py | 2 +- netbox/templates/500.html | 2 +- netbox/templates/_base.html | 2 +- netbox/templates/circuits/circuittermination_edit.html | 2 +- netbox/templates/circuits/provider.html | 2 +- netbox/templates/dcim/cable_connect.html | 2 +- netbox/templates/dcim/device.html | 2 +- netbox/templates/dcim/device_config.html | 2 +- netbox/templates/dcim/device_status.html | 2 +- netbox/templates/dcim/site.html | 2 +- netbox/templates/inc/ajax_loader.html | 2 +- netbox/templates/inc/nav_menu.html | 2 +- netbox/templates/ipam/ipaddress_assign.html | 2 +- netbox/templates/ipam/ipaddress_bulk_add.html | 2 +- netbox/templates/ipam/ipaddress_edit.html | 2 +- netbox/templates/secrets/secret.html | 2 +- netbox/templates/secrets/secret_edit.html | 2 +- netbox/templates/secrets/secret_import.html | 2 +- netbox/templates/tenancy/tenant_edit.html | 2 +- netbox/templates/users/userkey_edit.html | 2 +- netbox/templates/virtualization/cluster_add_devices.html | 2 +- requirements.txt | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/netbox/ipam/fields.py b/netbox/ipam/fields.py index 6db3a00f2..97a4de62f 100644 --- a/netbox/ipam/fields.py +++ b/netbox/ipam/fields.py @@ -16,7 +16,7 @@ class BaseIPField(models.Field): def python_type(self): return IPNetwork - def from_db_value(self, value, expression, connection, context): + def from_db_value(self, value, expression, connection): return self.to_python(value) def to_python(self, value): diff --git a/netbox/templates/500.html b/netbox/templates/500.html index 1da608a48..c09061c10 100644 --- a/netbox/templates/500.html +++ b/netbox/templates/500.html @@ -1,4 +1,4 @@ -{% load static from staticfiles %} +{% load static %} diff --git a/netbox/templates/_base.html b/netbox/templates/_base.html index 27ebb052d..6de03b4e2 100644 --- a/netbox/templates/_base.html +++ b/netbox/templates/_base.html @@ -1,4 +1,4 @@ -{% load static from staticfiles %} +{% load static %} {% load helpers %} diff --git a/netbox/templates/circuits/circuittermination_edit.html b/netbox/templates/circuits/circuittermination_edit.html index 792ff99b8..274c2a372 100644 --- a/netbox/templates/circuits/circuittermination_edit.html +++ b/netbox/templates/circuits/circuittermination_edit.html @@ -1,5 +1,5 @@ {% extends '_base.html' %} -{% load staticfiles %} +{% load static %} {% load form_helpers %} {% block content %} diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html index 733632342..99f615a90 100644 --- a/netbox/templates/circuits/provider.html +++ b/netbox/templates/circuits/provider.html @@ -1,5 +1,5 @@ {% extends '_base.html' %} -{% load static from staticfiles %} +{% load static %} {% load helpers %} {% block title %}{{ provider }}{% endblock %} diff --git a/netbox/templates/dcim/cable_connect.html b/netbox/templates/dcim/cable_connect.html index 310736af7..257c6da79 100644 --- a/netbox/templates/dcim/cable_connect.html +++ b/netbox/templates/dcim/cable_connect.html @@ -1,5 +1,5 @@ {% extends '_base.html' %} -{% load static from staticfiles %} +{% load static %} {% load form_helpers %} {% block content %} diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 7c1042d2c..7289909b1 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -1,5 +1,5 @@ {% extends '_base.html' %} -{% load static from staticfiles %} +{% load static %} {% load helpers %} {% block title %}{{ device }}{% endblock %} diff --git a/netbox/templates/dcim/device_config.html b/netbox/templates/dcim/device_config.html index 210a9379a..fa35f28aa 100644 --- a/netbox/templates/dcim/device_config.html +++ b/netbox/templates/dcim/device_config.html @@ -1,5 +1,5 @@ {% extends 'dcim/device.html' %} -{% load staticfiles %} +{% load static %} {% block title %}{{ device }} - Config{% endblock %} diff --git a/netbox/templates/dcim/device_status.html b/netbox/templates/dcim/device_status.html index 7743cc635..de9f57935 100644 --- a/netbox/templates/dcim/device_status.html +++ b/netbox/templates/dcim/device_status.html @@ -1,5 +1,5 @@ {% extends 'dcim/device.html' %} -{% load staticfiles %} +{% load static %} {% block title %}{{ device }} - Status{% endblock %} diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html index 8fedfbcee..b74521e9c 100644 --- a/netbox/templates/dcim/site.html +++ b/netbox/templates/dcim/site.html @@ -1,5 +1,5 @@ {% extends '_base.html' %} -{% load static from staticfiles %} +{% load static %} {% load tz %} {% load helpers %} diff --git a/netbox/templates/inc/ajax_loader.html b/netbox/templates/inc/ajax_loader.html index b5b3ee2c1..f6982bd65 100644 --- a/netbox/templates/inc/ajax_loader.html +++ b/netbox/templates/inc/ajax_loader.html @@ -1,4 +1,4 @@ -{% load staticfiles %} +{% load static %}
diff --git a/netbox/templates/inc/nav_menu.html b/netbox/templates/inc/nav_menu.html index 64f68e7e2..5f8f371d3 100644 --- a/netbox/templates/inc/nav_menu.html +++ b/netbox/templates/inc/nav_menu.html @@ -1,4 +1,4 @@ -{% load static from staticfiles %} +{% load static %} {% load helpers %}