GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-12 09:10:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

minor images list fixes

Browse Source
This commit is contained in:
Devaev Maxim 2019-11-10 04:47:40 +03:00
parent 79947cccf0
commit 31a213385d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/share/js/kvm/msd.js
View File

@ -187,7 +187,7 @@ export function Msd() {
$("msd-reset-button").classList.toggle("feature-disabled", !__state.enabled); $("msd-reset-button").classList.toggle("feature-disabled", !__state.enabled);
__showMessageOffline(!__state.online); __showMessageOffline(!__state.online);
__showMessageImageBroken(__state.online && __state.drive.image && !__state.drive.image.complete && !__state.drive.uploading); __showMessageImageBroken(__state.online && __state.drive.image && !__state.drive.image.complete && !__state.storage.uploading);
if (__state.features.cdrom) { if (__state.features.cdrom) {
__showMessageTooBigForCdrom(__state.online && __state.drive.image && __state.drive.cdrom && __state.drive.image.size >= 2359296000); __showMessageTooBigForCdrom(__state.online && __state.drive.image && __state.drive.cdrom && __state.drive.image.size >= 2359296000);
} }
@ -219,7 +219,7 @@ export function Msd() {
} }
wm.switchEnabled($("msd-image-selector"), (__state.online && __state.features.multi && !__state.drive.connected && !__state.busy)); wm.switchEnabled($("msd-image-selector"), (__state.online && __state.features.multi && !__state.drive.connected && !__state.busy));
if (__state.features.multi) { if (__state.features.multi && !__state.storage.uploading) {
__refreshImageSelector(); __refreshImageSelector();
} }
wm.switchEnabled($("msd-remove-image"), (__state.online && __state.features.multi && __state.drive.image && !__state.drive.connected && !__state.busy)); wm.switchEnabled($("msd-remove-image"), (__state.online && __state.features.multi && __state.drive.image && !__state.drive.connected && !__state.busy));
@ -325,11 +325,13 @@ export function Msd() {
el.options.length = 1; el.options.length = 1;
if (__state.online) { if (__state.online) {
for (let image of Object.values(__state.storage.images)) { let names = Object.keys(__state.storage.images).sort();
let title = `${image.name} (${tools.formatSize(image.size)}${image.complete ? "" : ", broken"})`; for (let name of Object.keys(__state.storage.images).sort()) {
let option = new Option(title, image.name, false, false); let image = __state.storage.images[name];
let title = `${name} (${tools.formatSize(image.size)}${image.complete ? "" : ", broken"})`;
let option = new Option(title, name, false, false);
el.options[index] = option; el.options[index] = option;
if (__state.drive.image && __state.drive.image.name == image.name && __state.drive.image.in_storage) { if (__state.drive.image && __state.drive.image.name == name && __state.drive.image.in_storage) {
select_index = index; select_index = index;
} }
++index; ++index;