Merge pull request #634 from catborise/master

fix user machine for listing
retspen · Feb 13, 2024 · 9ee1571 · 9ee1571
2 parents 1f90a6c + f86eb78
commit 9ee1571
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 16 deletions.
diff --git 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
@@ -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
diff --git a/instances/templates/allinstances.html b/instances/templates/allinstances.html
@@ -24,12 +24,10 @@
  {% endif %}
  {% endfor %}
  <div class="col-lg-12">
- {% 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 %}
  </div>
 {% endblock content %}

diff --git 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");
 }
 </script>

diff --git 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