From 1700ddf8f1a7bed0fb867556d62ba92e7589011d Mon Sep 17 00:00:00 2001
From: catborise <catborise@gmail.com>
Date: Wed, 25 Jul 2018 11:28:05 +0300
Subject: [PATCH] undo extension adding changes

---
 instances/templates/instance.html | 7 -------
 instances/views.py                | 3 ---
 webvirtcloud/settings.py.template | 1 -
 3 files changed, 11 deletions(-)

diff --git a/instances/templates/instance.html b/instances/templates/instance.html
index aa3af36..f50de4f 100644
--- a/instances/templates/instance.html
+++ b/instances/templates/instance.html
@@ -415,13 +415,6 @@
                                                             <div class="col-sm-4">
                                                                 <input type="text" class="form-control" name="name" placeholder="{% trans "Name" %}" required pattern="[a-zA-Z0-9\.\-_]+">
                                                             </div>
-                                                            <div class="col-sm-2">
-                                                                <select name="extension" class="form-control image-format">
-                                                                {% for extension in extensions %}
-                                                                    <option value="{{ extension }}" {% if extension == default_extension %}selected{% endif %}>{% trans extension %}</option>
-                                                                {% endfor %}
-                                                                </select>
-                                                            </div>
                                                         </div>
                                                         <div class="form-group">
                                                             <label class="col-sm-3 control-label" style="font-weight:normal;">{% trans "Format" %}</label>
diff --git a/instances/views.py b/instances/views.py
index 236b1ac..85f31cb 100644
--- a/instances/views.py
+++ b/instances/views.py
@@ -366,9 +366,7 @@ def instance(request, compute_id, vname):
         cache_modes = sorted(conn.get_cache_modes().items())
         default_cache = settings.INSTANCE_VOLUME_DEFAULT_CACHE
         default_format = settings.INSTANCE_VOLUME_DEFAULT_FORMAT
-        default_extension = settings.INSTANCE_VOLUME_DEFAULT_FILE_EXTENSION
         formats = conn.get_image_formats()
-        extensions = conn.get_file_extensions()
 
 
         busses = conn.get_busses()
@@ -521,7 +519,6 @@ def instance(request, compute_id, vname):
                                    compute.type)
                 storage = request.POST.get('storage', '')
                 name = request.POST.get('name', '')
-                extension = request.POST.get('extension', '')
                 format = request.POST.get('format', '')
                 size = request.POST.get('size', 0)
                 meta_prealloc = request.POST.get('meta_prealloc', False)
diff --git a/webvirtcloud/settings.py.template b/webvirtcloud/settings.py.template
index aebe2f0..ffee758 100644
--- a/webvirtcloud/settings.py.template
+++ b/webvirtcloud/settings.py.template
@@ -143,7 +143,6 @@ SHOW_PROFILE_EDIT_PASSWORD = False
 # available: default (grid), list
 VIEW_ACCOUNTS_STYLE = 'grid'
 
-INSTANCE_VOLUME_DEFAULT_FILE_EXTENSION = 'qcow2'
 INSTANCE_VOLUME_DEFAULT_FORMAT = 'qcow2'
 INSTANCE_VOLUME_DEFAULT_BUS = 'virtio'
 INSTANCE_VOLUME_DEFAULT_CACHE = 'directsync'