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

Merge pull request #18214 from liviuconcioiu/18211

Browse Source 
Fix #18211 - Add server id parameter
This commit is contained in:
Maurício Meneghini Fauth 2023-03-04 19:18:36 -03:00 committed by GitHub
commit ec8a6a418f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/src/export.js
View File

@ -727,16 +727,22 @@ Export.checkTimeOut = function (timeLimit) {
limit = limit + 1;
clearTimeout(timeOut);
timeOut = setTimeout(function () {
$.get('index.php?route=/export/check-time-out', { 'ajax_request': true }, function (data) {
if (data.message === 'timeout') {
Functions.ajaxShowMessage(
'<div class="alert alert-danger" role="alert">' +
Messages.strTimeOutError +
'</div>',
false
);
$.get('index.php?route=/export/check-time-out',
{
'ajax_request': true,
'server': CommonParams.get('server')
},
function (data) {
if (data.message === 'timeout') {
Functions.ajaxShowMessage(
'<div class="alert alert-danger" role="alert">' +
Messages.strTimeOutError +
'</div>',
false
);
}
}
});
);
}, limit * 1000);
};

12
js/src/home.js
View File

@ -121,9 +121,15 @@ AJAX.registerTeardown('home.js', function () {
AJAX.registerOnload('home.js', function () {
$('#themesModal').on('show.bs.modal', function () {
$.get('index.php?route=/themes', function (data) {
$('#themesModal .modal-body').html(data.themes);
});
$.get(
'index.php?route=/themes',
{
'server': CommonParams.get('server'),
},
function (data) {
$('#themesModal .modal-body').html(data.themes);
}
);
});
/**