From 5aa22ac042dc3e9f30d74201decae25c1c41f36a Mon Sep 17 00:00:00 2001 From: catborise Date: Tue, 15 Jun 2021 09:42:55 +0300 Subject: [PATCH] Django 3.2.4 LTS upgrade --- computes/templates/computes/instances.html | 2 +- computes/templates/overview.html | 2 +- computes/urls.py | 2 +- conf/requirements.txt | 2 +- console/templates/console-base.html | 2 +- console/templates/console-spice-full.html | 2 +- console/templates/console-spice-lite.html | 2 +- console/templates/console-vnc-full.html | 2 +- console/templates/console-vnc-lite.html | 2 +- instances/templates/allinstances.html | 2 +- instances/templates/create_instance_w1.html | 2 +- instances/templates/create_instance_w2.html | 2 +- instances/templates/instance.html | 2 +- interfaces/templates/interfaces.html | 2 +- networks/templates/network.html | 2 +- nwfilters/templates/nwfilter.html | 2 +- nwfilters/templates/nwfilters.html | 2 +- storages/templates/storage.html | 2 +- {secrets => virtsecrets}/__init__.py | 0 {secrets => virtsecrets}/forms.py | 0 .../migrations/__init__.py | 0 {secrets => virtsecrets}/models.py | 0 .../templates/create_secret_block.html | 0 .../templates/secrets.html | 2 +- {secrets => virtsecrets}/tests.py | 0 {secrets => virtsecrets}/views.py | 4 +- vrtManager/{secrets.py => virtsecrets.py} | 0 webvirtcloud/settings.py.template | 44 ++++++++++++++++--- 28 files changed, 58 insertions(+), 28 deletions(-) rename {secrets => virtsecrets}/__init__.py (100%) rename {secrets => virtsecrets}/forms.py (100%) rename {secrets => virtsecrets}/migrations/__init__.py (100%) rename {secrets => virtsecrets}/models.py (100%) rename {secrets => virtsecrets}/templates/create_secret_block.html (100%) rename {secrets => virtsecrets}/templates/secrets.html (99%) rename {secrets => virtsecrets}/tests.py (100%) rename {secrets => virtsecrets}/views.py (97%) rename vrtManager/{secrets.py => virtsecrets.py} (100%) diff --git a/computes/templates/computes/instances.html b/computes/templates/computes/instances.html index bdac072..e6416c5 100644 --- a/computes/templates/computes/instances.html +++ b/computes/templates/computes/instances.html @@ -1,6 +1,6 @@ {% extends "base.html" %} {% load i18n %} -{% load staticfiles %} +{% load static %} {% load icons %} {% block title %}{% trans "Instances" %} - {{ compute.name }}{% endblock %} {% block style %} diff --git a/computes/templates/overview.html b/computes/templates/overview.html index 2894ebb..bddaa83 100644 --- a/computes/templates/overview.html +++ b/computes/templates/overview.html @@ -1,6 +1,6 @@ {% extends "base.html" %} {% load i18n %} -{% load staticfiles %} +{% load static %} {% load icons %} {% block title %}{% trans "Overview" %} - {{ compute.name }}{% endblock %} diff --git a/computes/urls.py b/computes/urls.py index 6e43695..15f6331 100644 --- a/computes/urls.py +++ b/computes/urls.py @@ -1,4 +1,4 @@ -from secrets.views import secrets +from virtsecrets.views import secrets from django.urls import include, path # from instances.views import create_instance, create_instance_select_type diff --git a/conf/requirements.txt b/conf/requirements.txt index 8d13382..235cd22 100644 --- a/conf/requirements.txt +++ b/conf/requirements.txt @@ -1,4 +1,4 @@ -Django==2.2.22 +Django==3.2.4 django-bootstrap4==3.0.1 django-icons==4.0.0 django-login-required-middleware==0.6.1 diff --git a/console/templates/console-base.html b/console/templates/console-base.html index 7875f7e..8627cec 100644 --- a/console/templates/console-base.html +++ b/console/templates/console-base.html @@ -1,4 +1,4 @@ -{% load staticfiles %} +{% load static %} {% load i18n %} diff --git a/console/templates/console-spice-full.html b/console/templates/console-spice-full.html index da7dae1..0dfed9f 100644 --- a/console/templates/console-spice-full.html +++ b/console/templates/console-spice-full.html @@ -24,7 +24,7 @@ --> {% extends "console-base.html" %} {% load i18n %} -{% load staticfiles %} +{% load static %} {% block head %} WebVirtCloud - Spice Client - Full diff --git a/console/templates/console-spice-lite.html b/console/templates/console-spice-lite.html index a984063..469c971 100644 --- a/console/templates/console-spice-lite.html +++ b/console/templates/console-spice-lite.html @@ -24,7 +24,7 @@ --> {% extends "console-base.html" %} {% load i18n %} -{% load staticfiles %} +{% load static %} {% block head %} WebVirtCloud - Spice - Lite diff --git a/console/templates/console-vnc-full.html b/console/templates/console-vnc-full.html index 05bf5b4..fae93e5 100755 --- a/console/templates/console-vnc-full.html +++ b/console/templates/console-vnc-full.html @@ -1,6 +1,6 @@ {% extends "console-base.html" %} {% load i18n %} -{% load staticfiles %} +{% load static %} {% block head %}