NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-14 09:51:22 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Upgraded to Django 2.1

Browse Source
This commit is contained in:
Jeremy Stretch 2018-11-02 14:42:15 -04:00
parent b05171b126
commit 0a71c63583
22 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/ipam/fields.py
View File

@ -16,7 +16,7 @@ class BaseIPField(models.Field):
def python_type(self): def python_type(self):
return IPNetwork return IPNetwork
def from_db_value(self, value, expression, connection, context): def from_db_value(self, value, expression, connection):
return self.to_python(value) return self.to_python(value)
def to_python(self, value): def to_python(self, value):

2
netbox/templates/500.html
View File

@ -1,4 +1,4 @@
{% load static from staticfiles %} {% load static %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">

2
netbox/templates/_base.html
View File

@ -1,4 +1,4 @@
{% load static from staticfiles %} {% load static %}
{% load helpers %} {% load helpers %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">

2
netbox/templates/circuits/circuittermination_edit.html
View File

@ -1,5 +1,5 @@
{% extends '_base.html' %} {% extends '_base.html' %}
{% load staticfiles %} {% load static %}
{% load form_helpers %} {% load form_helpers %}
{% block content %} {% block content %}

2
netbox/templates/circuits/provider.html
View File

@ -1,5 +1,5 @@
{% extends '_base.html' %} {% extends '_base.html' %}
{% load static from staticfiles %} {% load static %}
{% load helpers %} {% load helpers %}
{% block title %}{{ provider }}{% endblock %} {% block title %}{{ provider }}{% endblock %}

2
netbox/templates/dcim/cable_connect.html
View File

@ -1,5 +1,5 @@
{% extends '_base.html' %} {% extends '_base.html' %}
{% load static from staticfiles %} {% load static %}
{% load form_helpers %} {% load form_helpers %}
{% block content %} {% block content %}

2
netbox/templates/dcim/device.html
View File

@ -1,5 +1,5 @@
{% extends '_base.html' %} {% extends '_base.html' %}
{% load static from staticfiles %} {% load static %}
{% load helpers %} {% load helpers %}
{% block title %}{{ device }}{% endblock %} {% block title %}{{ device }}{% endblock %}

2
netbox/templates/dcim/device_config.html
View File

@ -1,5 +1,5 @@
{% extends 'dcim/device.html' %} {% extends 'dcim/device.html' %}
{% load staticfiles %} {% load static %}
{% block title %}{{ device }} - Config{% endblock %} {% block title %}{{ device }} - Config{% endblock %}

2
netbox/templates/dcim/device_status.html
View File

@ -1,5 +1,5 @@
{% extends 'dcim/device.html' %} {% extends 'dcim/device.html' %}
{% load staticfiles %} {% load static %}
{% block title %}{{ device }} - Status{% endblock %} {% block title %}{{ device }} - Status{% endblock %}

2
netbox/templates/dcim/site.html
View File

@ -1,5 +1,5 @@
{% extends '_base.html' %} {% extends '_base.html' %}
{% load static from staticfiles %} {% load static %}
{% load tz %} {% load tz %}
{% load helpers %} {% load helpers %}

2
netbox/templates/inc/ajax_loader.html
View File

@ -1,4 +1,4 @@
{% load staticfiles %} {% load static %}
<div class="loading text-center"> <div class="loading text-center">
<img src="{% static 'img/ajax-loader.gif' %}" /> <img src="{% static 'img/ajax-loader.gif' %}" />
</div> </div>

2
netbox/templates/inc/nav_menu.html
View File

@ -1,4 +1,4 @@
{% load static from staticfiles %} {% load static %}
{% load helpers %} {% load helpers %}
<nav class="navbar navbar-default navbar-fixed-top"> <nav class="navbar navbar-default navbar-fixed-top">
<div class="container"> <div class="container">

2
netbox/templates/ipam/ipaddress_assign.html
View File

@ -1,5 +1,5 @@
{% extends 'utilities/obj_edit.html' %} {% extends 'utilities/obj_edit.html' %}
{% load static from staticfiles %} {% load static %}
{% load form_helpers %} {% load form_helpers %}
{% load helpers %} {% load helpers %}

2
netbox/templates/ipam/ipaddress_bulk_add.html
View File

@ -1,5 +1,5 @@
{% extends 'utilities/obj_edit.html' %} {% extends 'utilities/obj_edit.html' %}
{% load static from staticfiles %} {% load static %}
{% load form_helpers %} {% load form_helpers %}
{% block title %}Bulk Add IP Addresses{% endblock %} {% block title %}Bulk Add IP Addresses{% endblock %}

2
netbox/templates/ipam/ipaddress_edit.html
View File

@ -1,5 +1,5 @@
{% extends 'utilities/obj_edit.html' %} {% extends 'utilities/obj_edit.html' %}
{% load static from staticfiles %} {% load static %}
{% load form_helpers %} {% load form_helpers %}
{% load helpers %} {% load helpers %}

2
netbox/templates/secrets/secret.html
View File

@ -1,5 +1,5 @@
{% extends '_base.html' %} {% extends '_base.html' %}
{% load static from staticfiles %} {% load static %}
{% load helpers %} {% load helpers %}
{% load secret_helpers %} {% load secret_helpers %}

2
netbox/templates/secrets/secret_edit.html
View File

@ -1,5 +1,5 @@
{% extends '_base.html' %} {% extends '_base.html' %}
{% load static from staticfiles %} {% load static %}
{% load form_helpers %} {% load form_helpers %}
{% block content %} {% block content %}

2
netbox/templates/secrets/secret_import.html
View File

@ -1,5 +1,5 @@
{% extends 'utilities/obj_import.html' %} {% extends 'utilities/obj_import.html' %}
{% load static from staticfiles %} {% load static %}
{% block content %} {% block content %}
{{ block.super }} {{ block.super }}

2
netbox/templates/tenancy/tenant_edit.html
View File

@ -1,5 +1,5 @@
{% extends 'utilities/obj_edit.html' %} {% extends 'utilities/obj_edit.html' %}
{% load static from staticfiles %} {% load static %}
{% load form_helpers %} {% load form_helpers %}
{% block form %} {% block form %}

2
netbox/templates/users/userkey_edit.html
View File

@ -1,5 +1,5 @@
{% extends 'users/_user.html' %} {% extends 'users/_user.html' %}
{% load static from staticfiles %} {% load static %}
{% load form_helpers %} {% load form_helpers %}
{% block title %}User Key{% endblock %} {% block title %}User Key{% endblock %}

2
netbox/templates/virtualization/cluster_add_devices.html
View File

@ -1,5 +1,5 @@
{% extends '_base.html' %} {% extends '_base.html' %}
{% load static from staticfiles %} {% load static %}
{% load form_helpers %} {% load form_helpers %}
{% block content %} {% block content %}

2
requirements.txt
View File

@ -1,4 +1,4 @@
Django>=2.0,<2.1 Django==2.1.3
django-cors-headers==2.4.0 django-cors-headers==2.4.0
django-debug-toolbar==1.10.1 django-debug-toolbar==1.10.1
django-filter==2.0.0 django-filter==2.0.0