mirror of
https://github.com/LD-Reborn/Berufsschule_HAM.git
synced 2025-12-20 06:51:55 +00:00
Fixed presets don't load when coming from inventory add asset link
This commit is contained in:
@@ -270,13 +270,25 @@
|
|||||||
|
|
||||||
|
|
||||||
<script defer>
|
<script defer>
|
||||||
document.addEventListener('DOMContentLoaded', () => {
|
document.addEventListener('DOMContentLoaded', () => {
|
||||||
|
});
|
||||||
|
|
||||||
|
document.addEventListener('DOMContentLoaded', async () => {
|
||||||
|
const createModal = document.getElementById('createAssetModal');
|
||||||
|
createModal.addEventListener('show.bs.modal', async () => {
|
||||||
|
const selectLocations = createModal.querySelector('#createLocationSelect');
|
||||||
|
await loadLocationsIntoSelect(selectLocations);
|
||||||
|
const selectPresets = createModal.querySelector('#createPresetSelect');
|
||||||
|
await loadPresetsIntoSelect(selectPresets);
|
||||||
|
const selectUsers = createModal.querySelector('#createUsersSelect');
|
||||||
|
await loadUsersIntoSelect(selectUsers);
|
||||||
|
});
|
||||||
// Open modal if URL contains parameter: CreateModal=true
|
// Open modal if URL contains parameter: CreateModal=true
|
||||||
const urlParams = new URLSearchParams(window.location.search);
|
const urlParams = new URLSearchParams(window.location.search);
|
||||||
if (urlParams.get('CreateModal') === 'true') {
|
if (urlParams.get('CreateModal') === 'true') {
|
||||||
const button = document.querySelector('[data-bs-toggle="modal"][data-bs-target="#createAssetModal"]');
|
const button = document.querySelector('[data-bs-toggle="modal"][data-bs-target="#createAssetModal"]');
|
||||||
if (button) {
|
if (button) {
|
||||||
button.click();
|
button.click();
|
||||||
urlParams.delete('CreateModal');
|
urlParams.delete('CreateModal');
|
||||||
const newUrl = window.location.pathname + '?' + urlParams.toString();
|
const newUrl = window.location.pathname + '?' + urlParams.toString();
|
||||||
history.replaceState({}, '', newUrl);
|
history.replaceState({}, '', newUrl);
|
||||||
@@ -813,17 +825,6 @@ function registerRowDetailviewClick(row) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
document.addEventListener('DOMContentLoaded', () => {
|
|
||||||
const createModal = document.getElementById('createAssetModal');
|
|
||||||
createModal.addEventListener('show.bs.modal', async () => {
|
|
||||||
const selectLocations = createModal.querySelector('#createLocationSelect');
|
|
||||||
await loadLocationsIntoSelect(selectLocations);
|
|
||||||
const selectPresets = createModal.querySelector('#createPresetSelect');
|
|
||||||
await loadPresetsIntoSelect(selectPresets);
|
|
||||||
const selectUsers = createModal.querySelector('#createUsersSelect');
|
|
||||||
await loadUsersIntoSelect(selectUsers);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
document.addEventListener('DOMContentLoaded', () => {
|
document.addEventListener('DOMContentLoaded', () => {
|
||||||
const presetApplyButton = document.getElementById('createPresetApply');
|
const presetApplyButton = document.getElementById('createPresetApply');
|
||||||
@@ -950,7 +951,7 @@ document.addEventListener('DOMContentLoaded', () => {
|
|||||||
plugins: ['clear_button'],
|
plugins: ['clear_button'],
|
||||||
create: false,
|
create: false,
|
||||||
sortField: { field: 'text', direction: 'asc' },
|
sortField: { field: 'text', direction: 'asc' },
|
||||||
placeholder: '@T["Select user"]',
|
placeholder: '@T["Select preset"]',
|
||||||
maxOptions: 500, // avoid performance hit if there are many
|
maxOptions: 500, // avoid performance hit if there are many
|
||||||
render: {
|
render: {
|
||||||
no_results: function(data, escape) {
|
no_results: function(data, escape) {
|
||||||
|
|||||||
Reference in New Issue
Block a user