Skip to content

Fix #20063 - Fix routine, event and trigger duplication when editing #20265

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
predictor2718 wants to merge 2 commits into
base: master
Choose a base branch
from
+14 −14
Open

Fix #20063 - Fix routine, event and trigger duplication when editing #20265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4c1131
Fix #20063 - Fix routine duplication when editing multiple times
predictor2718 Apr 4, 2026
8c5ddc2
Fix #20063 - Fix event and trigger duplication when editing multiple …
predictor2718 Apr 4, 2026
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
8 changes: 4 additions & 4 deletions resources/js/database/events.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@ const DatabaseEvents = {
eventsExportModal.querySelector('.modal-body').innerHTML = eventsExportTextarea;
document.getElementById('eventsExportTextarea').textContent = data.message;
getSqlEditor($('#eventsExportTextarea'));
});
}, { once: true });

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

bootstrap.Modal.getOrCreateInstance(eventsExportModal).show();
}
Expand Down Expand Up @@ -325,14 +325,14 @@ const DatabaseEvents = {
};
that.syntaxHiglighter = getSqlEditor($elm, {}, 'vertical', linterOptions);
window.codeMirrorEditor = that.syntaxHiglighter;
});
}, { once: true });

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

bootstrap.Modal.getOrCreateInstance(eventsEditorModal).show();
});
Expand Down
12 changes: 6 additions & 6 deletions resources/js/database/routines.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,11 @@ const DatabaseRoutines = {
routinesExportModal.querySelector('.modal-body').innerHTML = routinesExportTextarea;
document.getElementById('routinesExportTextarea').textContent = data.message;
getSqlEditor($('#routinesExportTextarea'));
});
}, { once: true });

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

bootstrap.Modal.getOrCreateInstance(routinesExportModal).show();
}
Expand Down Expand Up @@ -348,14 +348,14 @@ const DatabaseRoutines = {

// Execute item-specific code
that.postDialogShow(data);
});
}, { once: true });

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

bootstrap.Modal.getOrCreateInstance(routinesEditorModal).show();
});
Expand Down Expand Up @@ -840,7 +840,7 @@ const DatabaseRoutines = {

const routinesExecuteModalExecuteButton = document.getElementById('routinesExecuteModalExecuteButton');
routinesExecuteModalExecuteButton?.removeEventListener('click', routinesExecuteButtonEventHandler);
});
}, { once: true });

routinesExecuteModal.addEventListener('shown.bs.modal', function () {
routinesExecuteModal.querySelector('.modal-title').textContent = data.title;
Expand Down Expand Up @@ -890,7 +890,7 @@ const DatabaseRoutines = {
modal.hide();
});
});
});
}, { once: true });

modal.show();
});
Expand Down
8 changes: 4 additions & 4 deletions resources/js/triggers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,11 @@ const DatabaseTriggers = {
triggersExportModal.querySelector('.modal-body').innerHTML = triggersExportTextarea;
document.getElementById('triggersExportTextarea').textContent = data.message;
getSqlEditor($('#triggersExportTextarea'));
});
}, { once: true });

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

bootstrap.Modal.getOrCreateInstance(triggersExportModal).show();
}
Expand Down Expand Up @@ -334,14 +334,14 @@ const DatabaseTriggers = {
};
that.syntaxHiglighter = getSqlEditor($elm, {}, 'vertical', linterOptions);
window.codeMirrorEditor = that.syntaxHiglighter;
});
}, { once: true });

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

bootstrap.Modal.getOrCreateInstance(triggersEditorModal).show();
});
Expand Down
Loading