From 82f5fbf1590a721a7dec1c2d6f07745f6ddc71f3 Mon Sep 17 00:00:00 2001
From: catborise <catborise@yahoo.com>
Date: Fri, 11 Sep 2020 15:35:32 +0300
Subject: [PATCH 1/2] change choices size from 50 to 70

---
 .../migrations/0005_auto_20200911_1233.py      | 18 ++++++++++++++++++
 appsettings/models.py                          |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 appsettings/migrations/0005_auto_20200911_1233.py

diff --git a/appsettings/migrations/0005_auto_20200911_1233.py b/appsettings/migrations/0005_auto_20200911_1233.py
new file mode 100644
index 0000000..ac57da7
--- /dev/null
+++ b/appsettings/migrations/0005_auto_20200911_1233.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.14 on 2020-09-11 12:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('appsettings', '0004_auto_20200716_0637'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='appsettings',
+            name='choices',
+            field=models.CharField(max_length=70, verbose_name='choices'),
+        ),
+    ]
diff --git a/appsettings/models.py b/appsettings/models.py
index 0e0393c..0d78231 100644
--- a/appsettings/models.py
+++ b/appsettings/models.py
@@ -9,5 +9,5 @@ class AppSettings(models.Model):
     name = models.CharField(_('name'), max_length=25, null=False)
     key = models.CharField(_('key'), db_index=True, max_length=50, unique=True)
     value = models.CharField(_('value'), max_length=25)
-    choices = models.CharField(_('choices'), max_length=50)
+    choices = models.CharField(_('choices'), max_length=70)
     description = models.CharField(_('description'), max_length=100, null=True)

From 45e3b00180fa917766a587e7b4197d953c6c569b Mon Sep 17 00:00:00 2001
From: catborise <catborise@yahoo.com>
Date: Fri, 11 Sep 2020 15:56:11 +0300
Subject: [PATCH 2/2] add getvvfile for desktop viewers.(virt-viewer)

---
 instances/templates/instances/access_tab.html | 3 +++
 instances/views.py                            | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/instances/templates/instances/access_tab.html b/instances/templates/instances/access_tab.html
index b32046e..56ac296 100644
--- a/instances/templates/instances/access_tab.html
+++ b/instances/templates/instances/access_tab.html
@@ -156,6 +156,9 @@
                         <a href="#" class="btn btn-success" id="vdi_url">{% trans "VDI" %}</a>
                     </span>
                 </div>
+                <p>{% trans "To download console.vv file for virt-viewer." %}</p>
+                <a href="{% url 'instances:getvvfile' instance.id %}" class="btn btn-lg btn-success float-right">{% trans "Get console.vv" %}</a>
+
                 <div class="clearfix"></div>
             </div>
             {% endif %}
diff --git a/instances/views.py b/instances/views.py
index bf74f62..f3f92e8 100644
--- a/instances/views.py
+++ b/instances/views.py
@@ -1164,7 +1164,10 @@ def getvvfile(request, pk):
     response = HttpResponse(content='', content_type='application/x-virt-viewer', status=200, reason=None, charset='utf-8')
     response.writelines('[virt-viewer]\n')
     response.writelines('type=' + conn.graphics_type(instance.name) + '\n')
-    response.writelines('host=' + conn.graphics_listen(instance.name) + '\n')
+    if conn.graphics_listen(instance.name) == '0.0.0.0':
+        response.writelines('host=' + conn.host + '\n')
+    else:
+        response.writelines('host=' + conn.graphics_listen(instance.name) + '\n')
     response.writelines('port=' + conn.graphics_port(instance.name) + '\n')
     response.writelines('title=' + conn.domain_name(instance.name) + '\n')
     response.writelines('password=' + conn.graphics_passwd(instance.name) + '\n')