From 5328c4c2ba8a0073b18b3db5cec62c809c542793 Mon Sep 17 00:00:00 2001 From: catborise Date: Thu, 10 Jun 2021 11:16:15 +0300 Subject: [PATCH 1/3] update required packages --- conf/requirements.txt | 16 ++++++++-------- dev/requirements.txt | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/conf/requirements.txt b/conf/requirements.txt index 8bcb55d..3682333 100644 --- a/conf/requirements.txt +++ b/conf/requirements.txt @@ -1,15 +1,15 @@ -Django==2.2.20 -django-bootstrap4==3.0.0 +Django==2.2.22 +django-bootstrap4==3.0.1 django-icons==3.0.0 -django-login-required-middleware==0.5.0 -django-otp==1.0.2 -django-qr-code==1.3.1 +django-login-required-middleware==0.6.1 +django-otp==1.0.6 +django-qr-code==2.2.0 gunicorn==20.1.0 -libsass==0.20.1 -libvirt-python==7.2.0 +libsass==0.21.0 +libvirt-python==7.4.0 lxml==4.6.3 qrcode==6.1 rwlock==0.0.7 websockify==0.9.0 -zipp==3.4.0 +zipp==3.4.1 ldap3==2.9.0 diff --git a/dev/requirements.txt b/dev/requirements.txt index 01053a2..3937a79 100644 --- a/dev/requirements.txt +++ b/dev/requirements.txt @@ -3,5 +3,5 @@ coverage==5.5 django-debug-toolbar==3.2.1 pycodestyle==2.7.0 pyflakes==2.3.1 -pylint==2.7.4 +pylint==2.8.3 yapf==0.31.0 From cb3ed618729628b23a23b1c55f8bd932e5ec77c3 Mon Sep 17 00:00:00 2001 From: catborise Date: Thu, 10 Jun 2021 11:17:44 +0300 Subject: [PATCH 2/3] exclude login view for login required necessity to prevent ERR_TOO_MANY_REDIRECTS error --- webvirtcloud/settings.py.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webvirtcloud/settings.py.template b/webvirtcloud/settings.py.template index 4dab092..d27fe53 100644 --- a/webvirtcloud/settings.py.template +++ b/webvirtcloud/settings.py.template @@ -212,7 +212,7 @@ SHOW_PROFILE_EDIT_PASSWORD = True OTP_ENABLED = False -LOGIN_REQUIRED_IGNORE_VIEW_NAMES = ["accounts:email_otp"] +LOGIN_REQUIRED_IGNORE_VIEW_NAMES = ["accounts:login", "accounts:email_otp"] LDAP_ENABLED = False LDAP_URL = '' From 768b49ea88d671a3adc98733d43432079e111b1c Mon Sep 17 00:00:00 2001 From: catborise Date: Thu, 10 Jun 2021 13:17:49 +0300 Subject: [PATCH 3/3] update django-icons to 4.0.0 --- conf/requirements.txt | 2 +- webvirtcloud/settings.py.template | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/conf/requirements.txt b/conf/requirements.txt index 3682333..8d13382 100644 --- a/conf/requirements.txt +++ b/conf/requirements.txt @@ -1,6 +1,6 @@ Django==2.2.22 django-bootstrap4==3.0.1 -django-icons==3.0.0 +django-icons==4.0.0 django-login-required-middleware==0.6.1 django-otp==1.0.6 django-qr-code==2.2.0 diff --git a/webvirtcloud/settings.py.template b/webvirtcloud/settings.py.template index d27fe53..74be031 100644 --- a/webvirtcloud/settings.py.template +++ b/webvirtcloud/settings.py.template @@ -83,6 +83,19 @@ TEMPLATES = [ WSGI_APPLICATION = "webvirtcloud.wsgi.application" +# Settings for django-icons +DJANGO_ICONS = { + + 'DEFAULTS': { + 'renderer': 'fontawesome4', + }, + + 'RENDERERS': { + 'fontawesome4': 'FontAwesome4Renderer', + 'bootstrap3': 'Bootstrap3Renderer', + }, +} + # Database # https://docs.djangoproject.com/en/3.0/ref/settings/#databases