gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 2afbd34129 into e3e7201917

Browse Source
This commit is contained in:
Nicolai 2026-06-02 02:32:51 +05:30 committed by GitHub
commit d588cd1e6e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
js/src/config.js
View File

@ -44,6 +44,7 @@ AJAX.registerTeardown('config.js', function () {
$('form.prefs-form').off('change').off('submit');
$(document).off('click', 'div.click-hide-message');
$('#prefs_autoload').find('a').off('click');
$('form.config-form').off('shown.bs.tab');
});
AJAX.registerOnload('config.js', function () {
@ -52,6 +53,43 @@ AJAX.registerOnload('config.js', function () {
$topmenuUpt.find('a:not(.active)').attr('rel', 'newpage');
});
// ------------------------------------------------------------------
// Tabbed forms - tab state persistence via location.hash
//
function setupConfigTabsPersistence () {
var $form = $('form.config-form');
if (!$form.length) {
return;
}
// Activate the tab indicated by the URL hash on page load
var hash = window.location.hash;
if (hash && /^#[a-zA-Z0-9_]+$/.test(hash)) {
var $tabLink = $form.find('a[data-bs-toggle="tab"][href="' + hash + '"]');
if ($tabLink.length) {
bootstrap.Tab.getOrCreateInstance($tabLink[0]).show();
}
}
// Keep the URL hash and the tab_hash hidden input in sync when the user switches tabs
$form.on('shown.bs.tab', '[data-bs-toggle="tab"]', function () {
var href = $(this).attr('href');
if (href) {
window.location.hash = href;
$form.find('input[name="tab_hash"]').val(href.replace(/^#/, ''));
}
});
}
AJAX.registerOnload('config.js', function () {
setupConfigTabsPersistence();
});
//
// END: Tabbed forms
// ------------------------------------------------------------------
// default values for fields
var defaultValues = {};

26
test/selenium/ServerSettingsTest.php
View File

@ -101,6 +101,32 @@ class ServerSettingsTest extends TestBase
self::assertTrue($this->byId('Sql_queries')->isDisplayed());
}
/**
* Tests that the active preferences tab is restored after a page refresh
*
* @group large
*/
public function testActiveTabRestoredAfterRefresh(): void
{
$this->byPartialLinkText('Main panel')->click();
$this->waitAjax();
$this->waitForElement('className', 'nav-tabs');
// Switch to a non-default tab
$this->byCssSelector("a[href='#Tabs']")->click();
self::assertTrue($this->byId('Tabs')->isDisplayed());
self::assertFalse($this->byId('Startup')->isDisplayed());
// Reload the page – the hash is preserved in the URL
$this->reloadPage();
$this->waitAjax();
// The previously active tab must still be shown
self::assertTrue($this->byId('Tabs')->isDisplayed());
self::assertFalse($this->byId('Startup')->isDisplayed());
}
/**
* Tests if hiding the logo works or not
*