From 2935c9d382d52d2041391240d1a52ea712bbf02f Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Wed, 23 Aug 2023 09:07:35 +0300
Subject: [PATCH 1/3] update django 3.2.20 -> 4.2.4

---
 .travis.yml           | 2 +-
 README.md             | 2 +-
 conf/requirements.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 10e31c5..24fcf3b 100644
--- 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
index 2027439..cbbfb29 100644
--- 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
index 72985da..b0529f1 100644
--- 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

From 56c92d90b58d18a67f71e8d03c641eb9cb62cc83 Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Wed, 23 Aug 2023 09:08:25 +0300
Subject: [PATCH 2/3] fix show snapshot exist indicator

---
 static/icon_cache/camera_None_None_None.svg   | 11 +++++++++++
 static/icon_cache/download_None_None_None.svg | 11 +++++++++++
 vrtManager/instance.py                        |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 static/icon_cache/camera_None_None_None.svg
 create mode 100644 static/icon_cache/download_None_None_None.svg

diff --git a/static/icon_cache/camera_None_None_None.svg b/static/icon_cache/camera_None_None_None.svg
new file mode 100644
index 0000000..47d4ed0
--- /dev/null
+++ b/static/icon_cache/camera_None_None_None.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-camera" viewBox="0 0 16 16">
+	
+  
+	<path d="M15 12a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V6a1 1 0 0 1 1-1h1.172a3 3 0 0 0 2.12-.879l.83-.828A1 1 0 0 1 6.827 3h2.344a1 1 0 0 1 .707.293l.828.828A3 3 0 0 0 12.828 5H14a1 1 0 0 1 1 1v6zM2 4a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2h-1.172a2 2 0 0 1-1.414-.586l-.828-.828A2 2 0 0 0 9.172 2H6.828a2 2 0 0 0-1.414.586l-.828.828A2 2 0 0 1 3.172 4H2z"/>
+	
+  
+	<path d="M8 11a2.5 2.5 0 1 1 0-5 2.5 2.5 0 0 1 0 5zm0 1a3.5 3.5 0 1 0 0-7 3.5 3.5 0 0 0 0 7zM3 6.5a.5.5 0 1 1-1 0 .5.5 0 0 1 1 0z"/>
+	
+
+</svg>
diff --git a/static/icon_cache/download_None_None_None.svg b/static/icon_cache/download_None_None_None.svg
new file mode 100644
index 0000000..5d28ba6
--- /dev/null
+++ b/static/icon_cache/download_None_None_None.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-download" viewBox="0 0 16 16">
+	
+  
+	<path d="M.5 9.9a.5.5 0 0 1 .5.5v2.5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2.5a.5.5 0 0 1 1 0v2.5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-2.5a.5.5 0 0 1 .5-.5z"/>
+	
+  
+	<path d="M7.646 11.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 10.293V1.5a.5.5 0 0 0-1 0v8.793L5.354 8.146a.5.5 0 1 0-.708.708l3 3z"/>
+	
+
+</svg>
diff --git a/vrtManager/instance.py b/vrtManager/instance.py
index cff2085..9cbe83e 100644
--- a/vrtManager/instance.py
+++ b/vrtManager/instance.py
@@ -1368,7 +1368,7 @@ class wvmInstance(wvmConnect):
         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:

From cf6f74f6c35876256fa61bc81c4c4825e3e3fa1b Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Wed, 23 Aug 2023 09:25:12 +0300
Subject: [PATCH 3/3] fix sr-only toggle dropdown to hide

---
 instances/templates/instances/access_tab.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/instances/templates/instances/access_tab.html b/instances/templates/instances/access_tab.html
index 813ba8e..ce44d95 100644
--- 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="#"