From 9f672be1f7bb5f8462374ca4732d095d4f24685b Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sun, 29 Mar 2026 23:11:13 +0000
Subject: [PATCH] =minor fixes upon uploading to server
---
assets/js/concise/UploadManager.js | 57 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/assets/js/concise/UploadManager.js b/assets/js/concise/UploadManager.js
index b8d4df8..e38109e 100644
--- a/assets/js/concise/UploadManager.js
+++ b/assets/js/concise/UploadManager.js
@@ -300,8 +300,6 @@
&& ['image_upload', 'video_upload', 'document_upload'].includes(operation.type)) {
let uploadIds = [];
- console.log('upload operation complete', operation);
-
if (operation.data) {
// Handle FormData
if (operation.data instanceof FormData) {
@@ -690,7 +688,8 @@
if (isUpload) {
data.append('mode', field.config.mode);
- data.append('field_name', field.config.name);
+
+ data.append('field_name', field.config.repeaterPath || field.config.name);
data.append('fieldId', field.id);
data.append('field_type', field.config.type);
data.append('subtype', field.config.subtype);
@@ -997,18 +996,27 @@
}
extractFieldConfig(fieldElement, autoUpload, imageMeta) {
- return {
+ const config = {
autoUpload: autoUpload,
showMeta: imageMeta,
- destination: fieldElement.dataset.destination || 'meta', //TODO: why do we need this?
+ destination: fieldElement.dataset.destination || 'meta',
content: this.extractFieldContent(fieldElement),
mode: fieldElement.dataset.mode || 'direct',
type: fieldElement.dataset.type || 'single',
name: fieldElement.dataset.field,
- itemID: this.extractFieldItemId(fieldElement)??0,
- maxFiles: parseInt(fieldElement.dataset.maxFiles)??25,
- subType: fieldElement.dataset.subtype?? 'image'
+ itemID: this.extractFieldItemId(fieldElement) ?? 0,
+ maxFiles: parseInt(fieldElement.dataset.maxFiles) ?? 25,
+ subType: fieldElement.dataset.subtype ?? 'image',
+ repeaterPath: null
};
+
+ const repeaterRow = fieldElement.closest('[data-index]');
+ const repeater = repeaterRow?.closest('[data-field][data-repeater-id]');
+ if (repeater && repeaterRow) {
+ config.repeaterPath = `${repeater.dataset.field}:${repeaterRow.dataset.index}:${config.name}`;
+ }
+
+ return config;
}
extractFieldContent(fieldElement) {
@@ -1024,12 +1032,17 @@
determineFieldId(fieldElement) {
let content = this.extractFieldContent(fieldElement);
content = (content === null) ? '' : content+'_';
-
let itemID = this.extractFieldItemId(fieldElement);
itemID = (itemID === null) ? '' : itemID+'_';
-
const field = fieldElement.dataset.field || '';
+ // If inside a repeater row, include repeater name + index for uniqueness
+ const repeaterRow = fieldElement.closest('[data-index]');
+ const repeater = repeaterRow?.closest('[data-field][data-repeater-id]');
+ if (repeater && repeaterRow) {
+ return `${content}${itemID}${repeater.dataset.field}_${repeaterRow.dataset.index}_${field}`;
+ }
+
return `${content}${itemID}${field}`;
}
@@ -1340,8 +1353,20 @@
let fieldId = uploads[0].field;
let field = document.querySelector(`[data-uploader="${fieldId}"]`);
if (!field) {
- console.log('No field found for '+fieldId);
- return;
+ if ('crudManager' in window && fieldId.startsWith(window.crudManager.content)) {
+ let [content, itemId, fieldName] = fieldId.split('_');
+ if (parseInt(itemId) > 0) {
+ window.crudManager.openEditModal(itemId);
+ field = document.querySelector(`[data-uploader="${fieldId}"]`);
+ } else {
+ console.log('No field found for '+fieldId);
+ return;
+ }
+ } else {
+ console.log('No field found for '+fieldId);
+ return;
+ }
+
}
let fieldData = this.fields.get(fieldId);
if (fieldData.groupUI.container) {
@@ -1447,6 +1472,9 @@
}
getSubtypeFromURL(url) {
+ if (!url || url === '') {
+ return '';
+ }
const imgs = ['.webp', '.jpg', '.jpeg', '.png', '.gif', '.svg'];
const videos = ['.mp4', '.ogg', '.mov', '.webm', '.avi'];
@@ -1498,7 +1526,10 @@
.map(el => el.dataset.id || el.dataset.uploadId)
.filter(Boolean);
- field.ui.hidden.value = remaining.join(',');
+ const newValue = remaining.join(',');
+ if (field.ui.hidden.value === newValue) return;
+
+ field.ui.hidden.value = newValue;
field.ui.hidden.dispatchEvent(new Event('change', { bubbles: true }));
}
async setBulkUpload(uploads, key, value) {
--
Gitblit v1.10.0