Visitar URL original
Merge pull request #20265 from predictor2718/fix/routines-duplicate-o… · phpmyadmin/phpmyadmin@ea951ef · GitHub
Skip to content

Commit ea951ef

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #20265 from predictor2718/fix/routines-duplicate-on-edit
Fix #20063 - Fix routine, event and trigger duplication when editing
2 parents 4fc7e94 + 8c5ddc2 commit ea951ef

3 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎resources/js/database/events.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,11 @@ const DatabaseEvents = {
116116
eventsExportModal.querySelector('.modal-body').innerHTML = eventsExportTextarea;
117117
document.getElementById('eventsExportTextarea').textContent = data.message;
118118
getSqlEditor($('#eventsExportTextarea'));
119-
});
119+
}, { once: true });
120120

121121
eventsExportModal.addEventListener('hidden.bs.modal', function () {
122122
eventsExportModal.querySelector('.modal-body').innerHTML = eventsExportTextarea;
123-
});
123+
}, { once: true });
124124

125125
bootstrap.Modal.getOrCreateInstance(eventsExportModal).show();
126126
}
@@ -325,14 +325,14 @@ const DatabaseEvents = {
325325
};
326326
that.syntaxHiglighter = getSqlEditor($elm, {}, 'vertical', linterOptions);
327327
window.codeMirrorEditor = that.syntaxHiglighter;
328-
});
328+
}, { once: true });
329329

330330
eventsEditorModal.addEventListener('hidden.bs.modal', function () {
331331
const eventsEditorModalSaveButton = document.getElementById('eventsEditorModalSaveButton');
332332
eventsEditorModalSaveButton?.removeEventListener('click', eventsEditorModalSaveEventHandler);
333333
document.getElementById('eventsEditorModal').querySelector('.modal-body').innerHTML = '<div class="spinner-border" role="status">' +
334334
'<span class="visually-hidden">' + window.Messages.strLoading + '</span></div>';
335-
});
335+
}, { once: true });
336336

337337
bootstrap.Modal.getOrCreateInstance(eventsEditorModal).show();
338338
});

‎resources/js/database/routines.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,11 @@ const DatabaseRoutines = {
132132
routinesExportModal.querySelector('.modal-body').innerHTML = routinesExportTextarea;
133133
document.getElementById('routinesExportTextarea').textContent = data.message;
134134
getSqlEditor($('#routinesExportTextarea'));
135-
});
135+
}, { once: true });
136136

137137
routinesExportModal.addEventListener('hidden.bs.modal', function () {
138138
routinesExportModal.querySelector('.modal-body').innerHTML = routinesExportTextarea;
139-
});
139+
}, { once: true });
140140

141141
bootstrap.Modal.getOrCreateInstance(routinesExportModal).show();
142142
}
@@ -348,14 +348,14 @@ const DatabaseRoutines = {
348348

349349
// Execute item-specific code
350350
that.postDialogShow(data);
351-
});
351+
}, { once: true });
352352

353353
routinesEditorModal.addEventListener('hidden.bs.modal', function () {
354354
const routinesEditorModalSaveButton = document.getElementById('routinesEditorModalSaveButton');
355355
routinesEditorModalSaveButton?.removeEventListener('click', routinesEditorModalSaveEventHandler);
356356
document.getElementById('routinesEditorModal').querySelector('.modal-body').innerHTML = '<div class="spinner-border" role="status">' +
357357
'<span class="visually-hidden">' + window.Messages.strLoading + '</span></div>';
358-
});
358+
}, { once: true });
359359

360360
bootstrap.Modal.getOrCreateInstance(routinesEditorModal).show();
361361
});
@@ -840,7 +840,7 @@ const DatabaseRoutines = {
840840

841841
const routinesExecuteModalExecuteButton = document.getElementById('routinesExecuteModalExecuteButton');
842842
routinesExecuteModalExecuteButton?.removeEventListener('click', routinesExecuteButtonEventHandler);
843-
});
843+
}, { once: true });
844844

845845
routinesExecuteModal.addEventListener('shown.bs.modal', function () {
846846
routinesExecuteModal.querySelector('.modal-title').textContent = data.title;
@@ -890,7 +890,7 @@ const DatabaseRoutines = {
890890
modal.hide();
891891
});
892892
});
893-
});
893+
}, { once: true });
894894

895895
modal.show();
896896
});

‎resources/js/triggers.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,11 @@ const DatabaseTriggers = {
123123
triggersExportModal.querySelector('.modal-body').innerHTML = triggersExportTextarea;
124124
document.getElementById('triggersExportTextarea').textContent = data.message;
125125
getSqlEditor($('#triggersExportTextarea'));
126-
});
126+
}, { once: true });
127127

128128
triggersExportModal.addEventListener('hidden.bs.modal', function () {
129129
triggersExportModal.querySelector('.modal-body').innerHTML = triggersExportTextarea;
130-
});
130+
}, { once: true });
131131

132132
bootstrap.Modal.getOrCreateInstance(triggersExportModal).show();
133133
}
@@ -334,14 +334,14 @@ const DatabaseTriggers = {
334334
};
335335
that.syntaxHiglighter = getSqlEditor($elm, {}, 'vertical', linterOptions);
336336
window.codeMirrorEditor = that.syntaxHiglighter;
337-
});
337+
}, { once: true });
338338

339339
triggersEditorModal.addEventListener('hidden.bs.modal', function () {
340340
const triggersEditorModalSaveButton = document.getElementById('triggersEditorModalSaveButton');
341341
triggersEditorModalSaveButton?.removeEventListener('click', triggersEditorModalSaveEventHandler);
342342
document.getElementById('triggersEditorModal').querySelector('.modal-body').innerHTML = '<div class="spinner-border" role="status">' +
343343
'<span class="visually-hidden">' + window.Messages.strLoading + '</span></div>';
344-
});
344+
}, { once: true });
345345

346346
bootstrap.Modal.getOrCreateInstance(triggersEditorModal).show();
347347
});

0 commit comments

Comments
 (0)