j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2024-12-24 15:15:22 +00:00
Code Issues Projects Releases Wiki Activity

Fix: for clone instance multiple disk name generating fixed

Browse source
This commit is contained in:
catborise 2019-03-19 14:39:34 +03:00
parent 5d1df70d41
commit fffbc92151
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
instances/templates/instance.html
View file

@ -1398,19 +1398,21 @@
function update_clone_disk_name(new_vname) { function update_clone_disk_name(new_vname) {
vname = '{{ vname }}'; vname = '{{ vname }}';
{% for disk in disks %} {% for disk in disks %}
disk_name = '{{ disk.image }}'; disk_name = '{{ disk.image }}';
disk_dot = disk_name.split('.') disk_dot = disk_name.split('.')
disk_dot_suffix = disk_dot[disk_dot.length-1]; disk_dot_suffix = disk_dot[disk_dot.length-1];
if (disk_name.startsWith(vname)) { if (disk_name.startsWith(vname)) {
image = disk_name.replace(vname, new_vname); image = disk_name.replace(vname, new_vname);
} else if (disk_name.lastIndexOf('.') > -1 && disk_dot_suffix.length <= 7) { } else if (disk_name.lastIndexOf('.') > -1 && disk_dot_suffix.length <= 7) {
image = new_vname + "." + disk_dot_suffix disk_dot.pop();
} else if (new_vname != disk_name) { disk_name_only = disk_dot.join('-')
image = new_vname image = new_vname + "-" + disk_name_only + "." + disk_dot_suffix
} else { } else if (new_vname != disk_name) {
image = new_vname + '-clone'; image = new_vname
} } else {
$('#disk_name-{{ disk.dev }}').val(image); image = new_vname + '-clone';
}
$('#disk_name-{{ disk.dev }}').val(image);
{% endfor %} {% endfor %}
} }
</script> </script>

2
instances/views.py
View file

@ -774,7 +774,7 @@ def instance(request, compute_id, vname):
if request.user.is_superuser or request.user.userattributes.can_clone_instances: if request.user.is_superuser or request.user.userattributes.can_clone_instances:
if 'clone' in request.POST: if 'clone' in request.POST:
clone_data = dict clone_data = dict()
clone_data['name'] = request.POST.get('name', '') clone_data['name'] = request.POST.get('name', '')
disk_sum = sum([disk['size'] >> 30 for disk in disks]) disk_sum = sum([disk['size'] >> 30 for disk in disks])