From 4dd7f7e258d382dbf73ff5beb1f43e03476b36cf Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Tue, 10 Feb 2026 21:08:23 +0000
Subject: [PATCH] =Taxonomy selector fixes in Form.php and TaxonomySelector.js
---
assets/js/concise/PopulateForm.js | 76 ++++++++++++++++++++++++++++++++-----
1 files changed, 65 insertions(+), 11 deletions(-)
diff --git a/assets/js/concise/PopulateForm.js b/assets/js/concise/PopulateForm.js
index d1c3f2e..761a134 100644
--- a/assets/js/concise/PopulateForm.js
+++ b/assets/js/concise/PopulateForm.js
@@ -20,6 +20,7 @@
populate (form, data = {})
{
this.data = data;
+ this.mergeRootData();
this.form = form;
if (!this.formHelper) {
this.formHelper = window.jvbForm;
@@ -42,6 +43,13 @@
}
}
+ mergeRootData(){
+ let check = ['status','date','modified'];
+ check.forEach(ch =>{
+ this.data.fields[`post_${ch}`] = this.data[ch];
+ });
+ }
+
/**
*
* @param {HTMLElement} field
@@ -83,7 +91,7 @@
if (!value || !Array.isArray(value)) return;
const container = field.querySelector('.repeater-items');
- let template = field.querySelector('template')?.className??false;
+ let template = field.querySelector('template')?.className ?? false;
if (!container || !template) return;
window.removeChildren(container);
@@ -91,8 +99,16 @@
value.forEach((data, index) => {
data.index = index;
const row = this.templates.create(template, data);
- let fields = row.querySelectorAll('.field');
- this.populate(fields, data);
+ if (!row) return;
+
+ for (let [fieldName, fieldValue] of Object.entries(data)) {
+ if (fieldName === 'index') continue;
+ let subField = row.querySelector(`[data-field="${fieldName}"]`);
+ if (subField) {
+ this.populateField(subField, fieldName, fieldValue);
+ }
+ }
+
container.append(row);
});
}
@@ -100,19 +116,52 @@
if (!value || !Array.isArray(value)) return;
const container = field.querySelector('.tag-items');
- let template = field.querySelector('template')?.className??false;
+ let template = field.querySelector('template')?.className ?? false;
if (!container || !template) return;
window.removeChildren(container);
value.forEach((data, index) => {
- data.index = index;
- const row = this.templates.create(template, data);
- let fields = row.querySelectorAll('.field');
- this.populate(fields, data);
+ const row = this.templates.create(template, {
+ label: this.getTagLabel(data, field.dataset.tagFormat ?? 'first_field'),
+ fieldName: name,
+ ...data
+ });
+ if (!row) return;
+
+ // Set hidden input values directly
+ row.querySelectorAll('input[type="hidden"]').forEach(input => {
+ const key = input.dataset.field;
+ if (key && data[key] !== undefined) {
+ input.value = data[key];
+ }
+ });
+
container.append(row);
});
}
+ /**
+ * Build tag label from data - mirrors addTagListItem logic
+ */
+ getTagLabel(data, format) {
+ const values = Object.values(data).filter(v => !this.isEmptyValue(v));
+ switch (format) {
+ case 'first_field':
+ return values[0] ?? 'New Item';
+ case 'all_fields':
+ return values.join(', ') || 'New Item';
+ default:
+ if (format.includes('{')) {
+ let label = format;
+ for (const [key, value] of Object.entries(data)) {
+ label = label.replace(`{${key}}`, value);
+ }
+ return label;
+ }
+ return data[format] ?? values[0] ?? 'New Item';
+ }
+ }
+
populateLocation(field, name, value) {
const subFields = ['address', 'lat', 'lng', 'street', 'city', 'province', 'postal_code', 'country'];
subFields.forEach(subField => {
@@ -137,7 +186,7 @@
}
}
populateUser(field, name, value) {
- this.populateTaxonomyField(field, name, value);
+ this.populateTaxonomy(field, name, value);
}
populateUpload(field, name, value) {
if (name === 'timeline' || field.dataset.subtype && field.dataset.subtype === 'timeline') {
@@ -154,13 +203,18 @@
}
const grid = field.querySelector('.item-grid');
- let uploadContainer = field.querySelector('.file-upload-container');
+ let uploadContainer = field.querySelector('.file-upload-wrapper');
uploadContainer.hidden = ids.length > 0;
field.querySelector('.progress')?.remove();
if (grid) {
window.removeChildren(grid);
ids.forEach(id => {
let data = this.data.images[id]??{};
+ data.field = {
+ config: {
+ showMeta: true
+ }
+ };
data.id = id;
grid.append(this.templates.create('uploadItem', data));
});
@@ -197,7 +251,7 @@
if (!value || !Array.isArray(value) || value.length === 0) return;
let grid = field.querySelector('.item-grid');
- let uploadContainer = field.querySelector('.file-upload-container');
+ let uploadContainer = field.querySelector('.file-upload-wrapper');
uploadContainer.hidden = value.length > 0;
if (grid) {
window.removeChildren(grid);
--
Gitblit v1.10.0