Skip to content

fix: Sort and widen VM network source dropdown #2656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ljm42 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Sort and widen VM network source dropdown #2656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1229,8 +1229,9 @@ function getValidNetworks() {
$arrValidNetworks['bridges'] = array_diff($arrBridges, $remove);

// This breaks VMSettings.page if libvirt is not running
if ($libvirt_running == "yes") {
if ($libvirt_running == "yes") {
$arrVirtual = $lv->libvirt_get_net_list($lv->get_connection());
sort($arrVirtual, SORT_NATURAL | SORT_FLAG_CASE);

if (($key = array_search('default', $arrVirtual)) !== false) {
unset($arrVirtual[$key]);
Expand Down
6 changes: 5 additions & 1 deletion emhttp/plugins/dynamix.vm.manager/styles/edit.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,10 @@ select.narrow {
min-width: 90px !important;
}

select.network_source {
width: 100%;
}

select.second {
margin-left: 12px;
max-width: 90px;
Expand Down Expand Up @@ -422,4 +426,4 @@ input.second {
.cpu-checkbox-dual .checkmark {
position: relative;
display: inline-block;
}
}
6 changes: 3 additions & 3 deletions emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1576,7 +1576,7 @@
<tr class="advanced">
<td>_(Network Source)_:</td>
<td>
<span class="width"><select name="nic[<?=$i?>][network]" class="narrow" onchange="updateMAC(<?=$i?>,this.value)">
<span class="width"><select name="nic[<?=$i?>][network]" class="network_source narrow" onchange="updateMAC(<?=$i?>,this.value)">
<?
foreach (array_keys($arrValidNetworks) as $key) {
echo mk_option("", $key, "- "._($key)." -", "disabled");
Expand Down Expand Up @@ -1649,7 +1649,7 @@
<tr class="advanced">
<td>_(Network Source)_:</td>
<td>
<span class="width"><select name="nic[{{INDEX}}][network]" class="narrow" onchange="updateMAC(INDEX,this.value)">
<span class="width"><select name="nic[{{INDEX}}][network]" class="network_source narrow" onchange="updateMAC(INDEX,this.value)">
<?
foreach (array_keys($arrValidNetworks) as $key) {
echo mk_option("", $key, "- "._($key)." -", "disabled");
Expand Down Expand Up @@ -3195,4 +3195,4 @@ function(inputValue) {
});
// Run once on load
attachNumaHandlers();
</script>
</script>
Loading