j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2026-11-11 12:46:49 +00:00
Code Issues Projects Releases Wiki Activity

fix(instances): the VM page opens the tab a redirect points to, and host links are for administrators

Browse source 
Redirects to #access (root password, SSH key) and other top-level panes
opened nothing, and some sub-tab ids did not exist. static/js/instance_tabs.js
opens the pane and the tab that holds it from the page structure, and
opens Settings on its first section, without leaving the current tab;
guest OS info is loaded whenever it is the section opened. The bottom bar linked to
host pages, which only administrators may open, and showed host names to
everyone. A stray </li> is removed; the page's inline scripts and the tab
logic are checked with Node.
This commit is contained in:
catborise 2026-10-07 23:57:10 +03:00
parent 70bed79c60
commit 44b3b6569a
7 changed files with 181 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

44
instances/templates/instance.html
View file

@ -675,43 +675,31 @@
return true;
});
</script>
<script src="{% static 'js/instance_tabs.js' %}"></script>
<script>
// Open the tab (and sub-tab) a redirect points to with #<pane id>
// Open the tab whose control targets "#<pane id>"
function show_tab(target) {
var button = document.querySelector('button[data-bs-target="' + target + '"]');
if (button) {
bootstrap.Tab.getOrCreateInstance(button).show();
}
}
var hash = location.hash;
var parents = {
'#poweron': '#power', '#poweroff': '#power', '#powercycle': '#power', '#suspend': '#power', '#resume': '#power',
'#resizevm_cpu': '#resize', '#resizevm_mem': '#resize', '#resizevm_disk': '#resize',
'#boot_opt': '#settings', '#disks': '#settings', '#network': '#settings', '#clone': '#settings',
'#xmledit': '#settings', '#vncsettings': '#settings', '#migrate': '#settings', '#options': '#settings',
'#users': '#settings',
'#takesnapshot': '#snapshots', '#takeextsnapshot': '#snapshots', '#managesnapshot': '#snapshots'
};
if (hash === '#resize') {
show_tab('#resize');
} else if (parents[hash]) {
show_tab(parents[hash]);
show_tab(hash);
}
// Settings opens on its first section the user has (Boot is superuser-only)
var settings_tabs = document.querySelector('#settings .nav-tabs');
if (settings_tabs && !settings_tabs.querySelector('.nav-link.active')) {
var first = settings_tabs.querySelector('.nav-link:not(#osinfo-tab)');
if (first) {
bootstrap.Tab.getOrCreateInstance(first).show();
var controls = document.querySelectorAll('[data-bs-target], a[data-bs-toggle][href]');
for (var i = 0; i < controls.length; i++) {
var c = controls[i];
if ((c.getAttribute('data-bs-target') || c.getAttribute('href')) === target) {
bootstrap.Tab.getOrCreateInstance(c).show();
return;
}
}
}
// after the whole page is parsed: load_osinfo is defined further down
document.addEventListener('DOMContentLoaded', function () {
restoreInstanceTab(document, location.hash, show_tab, load_osinfo);
});
</script>
<script>
function get_osinfo() {
show_tab('#settings');
show_tab('#osinfo');
load_osinfo();
}
function load_osinfo() {
$.getJSON("{% url 'instances:osinfo' instance.id %}", function (data) {
$.each(data, function() {
$('#oshostname').text(data['host-name']);