Merge pull request #596 from catborise/master

update to django 4.2 LTS
retspen · Aug 31, 2023 · 5d3a11e · 5d3a11e
2 parents a02df25 + cf6f74f
commit 5d3a11e
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: python
 python:
   - "3.9"
 env:
-  - DJANGO=3.2.15
+  - DJANGO=4.2.4
 install:
   - pip install -r dev/requirements.txt
 script:

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 [![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/retspen/webvirtcloud)
 
 # WebVirtCloud
-###### Python 3.x & Django 3.2 LTS
+###### Python 3.x & Django 4.2 LTS
 
 ## Features
 * QEMU/KVM Hypervisor Management

diff --git a/conf/requirements.txt b/conf/requirements.txt
@@ -1,4 +1,4 @@
-Django==3.2.20
+Django==4.2.4
 django_bootstrap5==23.3
 django-bootstrap-icons==0.8.3
 django-login-required-middleware==0.9.0

diff --git a/instances/templates/instances/access_tab.html b/instances/templates/instances/access_tab.html
@@ -62,12 +62,11 @@
             {% endif %}
             {% if instance.status == 1 %}
             <!-- Split button -->
-            <div class="btn-group float-end">
+            <div class="btn-group float-end" role="group">
                 <button type="button" id="consoleBtnGroup" class="btn btn-lg btn-success"
                     onclick="open_console('lite')">{% trans 'Console' %}</button>
                 <button type="button" class="btn btn-success dropdown-toggle dropdown-toggle-split"
                     data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                    <span class="sr-only">{%  trans 'Toggle Dropdown' %}</span>
                 </button>
                 <div class="dropdown-menu">
                     <a class="dropdown-item" href="#"

diff --git a/static/icon_cache/camera_None_None_None.svg b/static/icon_cache/camera_None_None_None.svg
diff --git a/static/icon_cache/download_None_None_None.svg b/static/icon_cache/download_None_None_None.svg
diff --git a/vrtManager/instance.py b/vrtManager/instance.py
@@ -1368,7 +1368,7 @@ def revert_external_snapshot(self, name, date, desc):
         name = name.replace("s1", "s2")
         self.create_external_snapshot(name, date, desc)
 
-    def get_snapshot(self, flag=VIR_DOMAIN_SNAPSHOT_LIST_INTERNAL):
+    def get_snapshot(self, flag=VIR_DOMAIN_SNAPSHOT_LIST_INTERNAL|VIR_DOMAIN_SNAPSHOT_LIST_EXTERNAL):
         snapshots = []
         snapshot_list = self.instance.snapshotListNames(flag)
         for snapshot in snapshot_list: