7 лет назад · 0a71c63583
--- 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):
			
--- a/netbox/templates/500.html
+++ b/netbox/templates/500.html
@@ -1,4 +1,4 @@
 
				-{% load static from staticfiles %}
			
 
				+{% load static %}
			
 
				 <!DOCTYPE html>
			
 
				 <html lang="en">
			
 
				 
			
--- a/netbox/templates/_base.html
+++ b/netbox/templates/_base.html
@@ -1,4 +1,4 @@
 
				-{% load static from staticfiles %}
			
 
				+{% load static %}
			
 
				 {% load helpers %}
			
 
				 <!DOCTYPE html>
			
 
				 <html lang="en">
			
--- 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 %}
			
--- 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 %}
			
--- 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 %}
			
--- 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 %}
			
--- 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 %}
			
 
				 
			
--- 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 %}
			
 
				 
			
--- 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 %}
			
 
				 
			
--- a/netbox/templates/inc/ajax_loader.html
+++ b/netbox/templates/inc/ajax_loader.html
@@ -1,4 +1,4 @@
 
				-{% load staticfiles %}
			
 
				+{% load static %}
			
 
				 <div class="loading text-center">
			
 
				     <img src="{% static 'img/ajax-loader.gif' %}" />
			
 
				 </div>
			
--- 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 %}
			
 
				 <nav class="navbar navbar-default navbar-fixed-top">
			
 
				     <div class="container">
			
--- a/netbox/templates/ipam/ipaddress_assign.html
+++ b/netbox/templates/ipam/ipaddress_assign.html
@@ -1,5 +1,5 @@
 
				 {% extends 'utilities/obj_edit.html' %}
			
 
				-{% load static from staticfiles %}
			
 
				+{% load static %}
			
 
				 {% load form_helpers %}
			
 
				 {% load helpers %}
			
 
				 
			
--- a/netbox/templates/ipam/ipaddress_bulk_add.html
+++ b/netbox/templates/ipam/ipaddress_bulk_add.html
@@ -1,5 +1,5 @@
 
				 {% extends 'utilities/obj_edit.html' %}
			
 
				-{% load static from staticfiles %}
			
 
				+{% load static %}
			
 
				 {% load form_helpers %}
			
 
				 
			
 
				 {% block title %}Bulk Add IP Addresses{% endblock %}
			
--- a/netbox/templates/ipam/ipaddress_edit.html
+++ b/netbox/templates/ipam/ipaddress_edit.html
@@ -1,5 +1,5 @@
 
				 {% extends 'utilities/obj_edit.html' %}
			
 
				-{% load static from staticfiles %}
			
 
				+{% load static %}
			
 
				 {% load form_helpers %}
			
 
				 {% load helpers %}
			
 
				 
			
--- a/netbox/templates/secrets/secret.html
+++ b/netbox/templates/secrets/secret.html
@@ -1,5 +1,5 @@
 
				 {% extends '_base.html' %}
			
 
				-{% load static from staticfiles %}
			
 
				+{% load static %}
			
 
				 {% load helpers %}
			
 
				 {% load secret_helpers %}
			
 
				 
			
--- a/netbox/templates/secrets/secret_edit.html
+++ b/netbox/templates/secrets/secret_edit.html
@@ -1,5 +1,5 @@
 
				 {% extends '_base.html' %}
			
 
				-{% load static from staticfiles %}
			
 
				+{% load static %}
			
 
				 {% load form_helpers %}
			
 
				 
			
 
				 {% block content %}
			
--- a/netbox/templates/secrets/secret_import.html
+++ b/netbox/templates/secrets/secret_import.html
@@ -1,5 +1,5 @@
 
				 {% extends 'utilities/obj_import.html' %}
			
 
				-{% load static from staticfiles %}
			
 
				+{% load static %}
			
 
				 
			
 
				 {% block content %}
			
 
				 {{ block.super }}
			
--- a/netbox/templates/tenancy/tenant_edit.html
+++ b/netbox/templates/tenancy/tenant_edit.html
@@ -1,5 +1,5 @@
 
				 {% extends 'utilities/obj_edit.html' %}
			
 
				-{% load static from staticfiles %}
			
 
				+{% load static %}
			
 
				 {% load form_helpers %}
			
 
				 
			
 
				 {% block form %}
			
--- a/netbox/templates/users/userkey_edit.html
+++ b/netbox/templates/users/userkey_edit.html
@@ -1,5 +1,5 @@
 
				 {% extends 'users/_user.html' %}
			
 
				-{% load static from staticfiles %}
			
 
				+{% load static %}
			
 
				 {% load form_helpers %}
			
 
				 
			
 
				 {% block title %}User Key{% endblock %}
			
--- a/netbox/templates/virtualization/cluster_add_devices.html
+++ b/netbox/templates/virtualization/cluster_add_devices.html
@@ -1,5 +1,5 @@
 
				 {% extends '_base.html' %}
			
 
				-{% load static from staticfiles %}
			
 
				+{% load static %}
			
 
				 {% load form_helpers %}
			
 
				 
			
 
				 {% block content %}
			
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
 
				-Django>=2.0,<2.1
			
 
				+Django==2.1.3
			
 
				 django-cors-headers==2.4.0
			
 
				 django-debug-toolbar==1.10.1
			
 
				 django-filter==2.0.0