j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2024-11-01 03:54:15 +00:00
Code Issues Projects Releases Wiki Activity

undo extension adding changes

Browse source
This commit is contained in:
catborise 2018-07-25 11:28:05 +03:00
parent c7b8d1ece0
commit 1700ddf8f1
3 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
instances/templates/instance.html
View file

@ -415,13 +415,6 @@
<div class="col-sm-4"> <div class="col-sm-4">
<input type="text" class="form-control" name="name" placeholder="{% trans "Name" %}" required pattern="[a-zA-Z0-9\.\-_]+"> <input type="text" class="form-control" name="name" placeholder="{% trans "Name" %}" required pattern="[a-zA-Z0-9\.\-_]+">
</div> </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>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label" style="font-weight:normal;">{% trans "Format" %}</label> <label class="col-sm-3 control-label" style="font-weight:normal;">{% trans "Format" %}</label>

3
instances/views.py
View file

@ -366,9 +366,7 @@ def instance(request, compute_id, vname):
cache_modes = sorted(conn.get_cache_modes().items()) cache_modes = sorted(conn.get_cache_modes().items())
default_cache = settings.INSTANCE_VOLUME_DEFAULT_CACHE default_cache = settings.INSTANCE_VOLUME_DEFAULT_CACHE
default_format = settings.INSTANCE_VOLUME_DEFAULT_FORMAT default_format = settings.INSTANCE_VOLUME_DEFAULT_FORMAT
default_extension = settings.INSTANCE_VOLUME_DEFAULT_FILE_EXTENSION
formats = conn.get_image_formats() formats = conn.get_image_formats()
extensions = conn.get_file_extensions()
busses = conn.get_busses() busses = conn.get_busses()
@ -521,7 +519,6 @@ def instance(request, compute_id, vname):
compute.type) compute.type)
storage = request.POST.get('storage', '') storage = request.POST.get('storage', '')
name = request.POST.get('name', '') name = request.POST.get('name', '')
extension = request.POST.get('extension', '')
format = request.POST.get('format', '') format = request.POST.get('format', '')
size = request.POST.get('size', 0) size = request.POST.get('size', 0)
meta_prealloc = request.POST.get('meta_prealloc', False) meta_prealloc = request.POST.get('meta_prealloc', False)

1
webvirtcloud/settings.py.template
View file

@ -143,7 +143,6 @@ SHOW_PROFILE_EDIT_PASSWORD = False
# available: default (grid), list # available: default (grid), list
VIEW_ACCOUNTS_STYLE = 'grid' VIEW_ACCOUNTS_STYLE = 'grid'
INSTANCE_VOLUME_DEFAULT_FILE_EXTENSION = 'qcow2'
INSTANCE_VOLUME_DEFAULT_FORMAT = 'qcow2' INSTANCE_VOLUME_DEFAULT_FORMAT = 'qcow2'
INSTANCE_VOLUME_DEFAULT_BUS = 'virtio' INSTANCE_VOLUME_DEFAULT_BUS = 'virtio'
INSTANCE_VOLUME_DEFAULT_CACHE = 'directsync' INSTANCE_VOLUME_DEFAULT_CACHE = 'directsync'