From 81b96b65128f6d3fbca3330f3a89c17887a0a1ed Mon Sep 17 00:00:00 2001 From: catborise Date: Tue, 13 Feb 2024 14:24:38 +0300 Subject: [PATCH 1/3] fix listing vms for normal users --- instances/templates/allinstances.html | 10 ++++------ instances/templates/allinstances_index_grouped.html | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/instances/templates/allinstances.html b/instances/templates/allinstances.html index d1f0b28c..9f10e1f8 100644 --- a/instances/templates/allinstances.html +++ b/instances/templates/allinstances.html @@ -24,12 +24,10 @@ {% endif %} {% endfor %}
- {% if 'instances.view_instances' in perms %} - {% if app_settings.VIEW_INSTANCES_LIST_STYLE == 'grouped' and request.user.is_superuser %} - {% include 'allinstances_index_grouped.html' %} - {% else %} - {% include 'allinstances_index_nongrouped.html' %} - {% endif %} + {% if app_settings.VIEW_INSTANCES_LIST_STYLE == 'grouped' and request.user.is_superuser %} + {% include 'allinstances_index_grouped.html' %} + {% else %} + {% include 'allinstances_index_nongrouped.html' %} {% endif %}
{% endblock content %} diff --git a/instances/templates/allinstances_index_grouped.html b/instances/templates/allinstances_index_grouped.html index e67ad932..290abe03 100644 --- a/instances/templates/allinstances_index_grouped.html +++ b/instances/templates/allinstances_index_grouped.html @@ -98,7 +98,7 @@ var rows = $('table tr'); host_rows = rows.filter("[host='"+host+"']"); host_rows.toggle(); - $("span[id='collapse_host_instances_"+host+"']").toggleClass("bi-chevron-down ").toggleClass("bi-chevron-up"); + $("span[id='collapse_host_instances_"+host+"']").toggleClass("bi bi-chevron-down ").toggleClass("bi bi-chevron-up"); $("span[id='inst_count_badge_"+host+"']").toggleClass("d-none"); } From 61447604562be16ae3dd5a55da8487960a345f9b Mon Sep 17 00:00:00 2001 From: catborise Date: Tue, 13 Feb 2024 14:28:13 +0300 Subject: [PATCH 2/3] update requirements --- conf/requirements.txt | 10 +++++----- dev/requirements.txt | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conf/requirements.txt b/conf/requirements.txt index 83a328ea..a7fad167 100644 --- a/conf/requirements.txt +++ b/conf/requirements.txt @@ -1,22 +1,22 @@ -Django==4.2.9 +Django==4.2.10 django_bootstrap5==23.4 django-bootstrap-icons==0.8.7 django-login-required-middleware==0.9.0 django-otp==1.3.0 django-qr-code==4.0.1 -django-auth-ldap==4.5.0 +django-auth-ldap==4.6.0 djangorestframework==3.14.0 drf-nested-routers==0.93.5 drf-yasg==1.21.7 -eventlet==0.34.3 +eventlet==0.35.1 gunicorn==21.2.0 libsass==0.23.0 libvirt-python==10.0.0 lxml==5.1.0 ldap3==2.9.1 markdown>=3.4.1 -python-engineio==4.8.2 -python-socketio==5.11.0 +python-engineio==4.9.0 +python-socketio==5.11.1 qrcode==7.4.2 rwlock==0.0.7 tzdata diff --git a/dev/requirements.txt b/dev/requirements.txt index 55b13e94..b76a47c4 100644 --- a/dev/requirements.txt +++ b/dev/requirements.txt @@ -1,9 +1,9 @@ -r ../conf/requirements.txt -coverage==7.4.0 -django-debug-toolbar==4.2.0 +coverage==7.4.1 +django-debug-toolbar==4.3.0 django-debug-toolbar-template-profiler pycodestyle==2.11.1 pyflakes==3.2.0 pylint==3.0.3 yapf==0.40.2 -black==23.12.1 +black==24.2.0 From f86eb78cbf1272387f178c9a064794486a6f59ae Mon Sep 17 00:00:00 2001 From: catborise Date: Tue, 13 Feb 2024 14:33:20 +0300 Subject: [PATCH 3/3] add smbios package to debian install --- webvirtcloud.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webvirtcloud.sh b/webvirtcloud.sh index b846b116..1026a9f7 100755 --- a/webvirtcloud.sh +++ b/webvirtcloud.sh @@ -480,7 +480,7 @@ case $distro in progress echo "* Installing OS requirements." - PACKAGES="git virtualenv python3-virtualenv python3-dev python3-lxml libvirt-dev zlib1g-dev libxslt1-dev libsasl2-dev libldap2-dev nginx supervisor libsasl2-modules gcc pkg-config python3-guestfs uuid" + PACKAGES="git virtualenv python3-virtualenv python3-dev python3-lxml libvirt-dev zlib1g-dev libxslt1-dev libsasl2-dev libldap2-dev nginx supervisor smbios-utils libsasl2-modules gcc pkg-config python3-guestfs uuid" install_packages set_hosts