mirror of
https://codeberg.org/PostERG/xamxam.git
synced 2026-06-25 16:19:19 +02:00
refactor: unify edit mode Format+Fichiers with add/partage HTMX fragment
- Edit mode now uses the same fichiers-fragment.php as add and partage, instead of duplicating the format checkboxes + new-file upload + website URL fieldsets. - Edit-only elements (existing files list, cover replace) stay in a separate #edit-existing-files-block below the shared fragment. - Removed .zip/.tar/.gz from the main TFE upload accept in both fichiers-fragment.php and fieldset-files.php. Archives go only in the Annexes file input. - Removed admin/format-website-fragment.php dependency from edit (no longer needed — the shared fragment handles website too). fix: jury repop crash + hx-preserve on file inputs, remove zip/tar from tfe accept - Jury fieldset add-mode repopulation now handles both scalar (legacy) and array (new dynamic multi-row) values for jury_promoteur and jury_promoteur_ulb_name. htmlspecialchars() was choking on array value. - All file inputs in fichiers-fragment.php wrapped in hx-preserve containers so HTMX swaps don't wipe user-selected files when toggling formats or the annexes checkbox. - Removed .zip/.tar/.gz from main TFE file accept — archives only via annexes input (which already had multiple + correct accept). - Edit mode now reuses the same fichiers-fragment.php fragment. fix: file inputs re-initialize after HTMX swap via inline script - Exposed window.XamxamInitFileUploads from file-upload-queue.js IIFE so HTMX fragments can trigger re-binding without a global listener. - fichiers-fragment.php emits <script>XamxamInitFileUploads()</script> at the end of the #format-fichiers-block fragment. - Removed hx-preserve wrappers — they prevented re-render after format/annexes toggles changed visible inputs. - This also fixes .zip removal from TFE accept and jury repopulation array crash from the previous commit. refactor: simplify file-upload-queue.js, remove file-preview.js - file-upload-queue.js rewritten from ~250 lines to ~120 lines: no more DataTransfer machinery, no IIFE wrapper, uses .onchange instead of addEventListener for simpler HTMX re-init. - window.XamxamInitFileUploads is the function itself (not an IIFE export). - Merged file-preview.js functionality into file-upload-queue.js (single-file .data-preview handling). Deleted file-preview.js. - fichiers-fragment.php inline script calls XamxamInitFileUploads() after every HTMX swap (same as before). debug: add console.log to file-upload-queue.js for file input behavior Adds logging at key points to diagnose why only one file is displayed: - XamxamInitFileUploads called - TFE queue picker init (id, multiple attribute state) - onchange event (files count, names) - fileArray post-concat length - Single-file preview bindings (id, multiple attribute) Remove after debug session.
This commit is contained in:
@@ -30,11 +30,29 @@ $promoteurUlbConditional = $promoteurUlbConditional ?? false;
|
||||
$adminMode = $adminMode ?? false;
|
||||
|
||||
// Add-mode repopulation from flash data
|
||||
$addMode = ($juryPromoteur === null && $juryPromoteurUlb === null && empty($lecteursInternes) && empty($lecteursExternes) && $juryPresident === null);
|
||||
$addMode = ($juryPromoteur === null && empty($juryPromoteurs) && $juryPromoteurUlb === null && empty($juryPromoteursUlb) && empty($lecteursInternes) && empty($lecteursExternes) && $juryPresident === null);
|
||||
if ($addMode && function_exists('old')) {
|
||||
$juryPromoteur = old('jury_promoteur') ?: null;
|
||||
$juryPromoteurUlb = old('jury_promoteur_ulb_name') ?: null;
|
||||
$juryPresident = old('jury_president') ?: null;
|
||||
// jury_promoteur may be array (new form) or scalar (legacy)
|
||||
$promoteursOld = old('jury_promoteur');
|
||||
if (is_array($promoteursOld)) {
|
||||
foreach ($promoteursOld as $name) {
|
||||
$name = trim($name ?? '');
|
||||
if ($name !== '') $juryPromoteurs[] = ['name' => $name];
|
||||
}
|
||||
} elseif (is_string($promoteursOld) && trim($promoteursOld) !== '') {
|
||||
$juryPromoteur = $promoteursOld;
|
||||
}
|
||||
// jury_promoteur_ulb_name may be array (new form) or scalar (legacy)
|
||||
$promoteursUlbOld = old('jury_promoteur_ulb_name');
|
||||
if (is_array($promoteursUlbOld)) {
|
||||
foreach ($promoteursUlbOld as $name) {
|
||||
$name = trim($name ?? '');
|
||||
if ($name !== '') $juryPromoteursUlb[] = ['name' => $name];
|
||||
}
|
||||
} elseif (is_string($promoteursUlbOld) && trim($promoteursUlbOld) !== '') {
|
||||
$juryPromoteurUlb = $promoteursUlbOld;
|
||||
}
|
||||
$juryPresident = old('jury_president') ?: null;
|
||||
for ($i = 0; $i < 10; $i++) {
|
||||
$n = old("jury_lecteur_interne:$i");
|
||||
if ($n !== '') $lecteursInternes[] = ['name' => $n];
|
||||
|
||||
Reference in New Issue
Block a user