Skip to content

#80(wpum custom fields) adding repeaters as subfields of a repeater should be allowed #410

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
reygcalantaol wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

#80(wpum custom fields) adding repeaters as subfields of a repeater should be allowed #410

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
eaf9ee4
Fix: dding Repeaters as subfields of a Repeater should be allowed.
Aug 11, 2025
b3b91de
Remove unnecessary code
Aug 11, 2025
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
163 changes: 102 additions & 61 deletions assets/js/src/wp-user-manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,18 @@ jQuery( function( $ ) {
init: function() {
var self = this;

$( '.add-repeater-row' ).each( function() {
var parent = $( this ).parents( 'fieldset' );
var repeater = parent.find( '.fieldset-wpum_field_group' ).not('.fieldset-wpum_field_group-clone' );

if ( repeater.length ) {
var name = parent.get( 0 ).classList[ 0 ];
self.increaseInstance( name );
self.validateMaxRows( name );
// Setup instances to first level repeaters
$('form > fieldset > .add-repeater-row').each(function () {
var fieldSet = $(this).closest( 'fieldset' );
var fieldGroup = $(fieldSet).find( ' > .fieldset-wpum_field_group' ).not('.fieldset-wpum_field_group-clone' );

if ( fieldGroup.length ) {
self.setupInstances(fieldSet, null);

var repeaterKey = self.getRepeaterKey(fieldSet);

self.increaseInstance( repeaterKey );
self.validateMaxRows( fieldSet );
}
} );

Expand All @@ -51,17 +55,21 @@ jQuery( function( $ ) {
} );

self.form.on( 'click', '.add-repeater-row', function() {
var parent = $( this ).parents( 'fieldset' );
self.addNewInstance( parent.get( 0 ).classList[ 0 ] );
var fieldSet = $(this).parent('fieldset');
// Setup new instance based on the parent fieldset
self.addNewInstance( fieldSet );
self.form.wpumConditionalFields({});
} );

self.form.on( 'click', '.remove-repeater-row', function(e) {
e.preventDefault();
var parent = $( this ).parents( 'fieldset' );
var $row = $( this ).parents( '.fieldset-wpum_field_group' );
var fieldSet = $(this).closest('fieldset');
var parentBase = $(fieldSet).attr('data-parent-base');
var $row = $( this ).parent( '.fieldset-wpum_field_group' );
$row.remove();
self.setupInstances( parent.get( 0 ).classList[ 0 ] );

self.setupInstances( fieldSet, parentBase );
self.validateMaxRows( fieldSet );
} );
},

Expand All @@ -73,23 +81,27 @@ jQuery( function( $ ) {
this.repeaters[ name ]++;
},

addNewInstance: function( name ) {
this.addNewRepeaterRow( name );
this.setupInstances( name );
addNewInstance: function( fieldSet ) {
this.addNewRepeaterRow(fieldSet);

var parentBase = $(fieldSet).attr('data-parent-base');
this.setupInstances(fieldSet, parentBase);

initFields();
},

resetInstance: function( name ) {
this.repeaters[ name ] = 0;
},

addNewRepeaterRow: function( name ) {
var repeater = $( '.' + name ).find( '.fieldset-wpum_field_group-clone' ).last();
addNewRepeaterRow: function (fieldSet) {
// Get repeater from the immediate child
var repeater = $(fieldSet).find(' > .fieldset-wpum_field_group-clone').last();
if ( !repeater.length ) {
return;
}

if ( !this.validateMaxRows( name ) ) {
if ( !this.validateMaxRows( fieldSet ) ) {
return;
}

Expand All @@ -99,58 +111,87 @@ jQuery( function( $ ) {
newRepeater.insertBefore( repeater );
},

setupInstances: function( name ) {
var repeaterRow = $( '.' + name ).find( '.fieldset-wpum_field_group' ).not( '.fieldset-wpum_field_group-clone' );
getRepeaterKey: function(fieldSet) {
var parentBase = $(fieldSet).attr('data-parent-base');
var repeaterKey = $(fieldSet).get(0).classList[0];
repeaterKey = repeaterKey.replace('fieldset-', '');

if (parentBase) {
repeaterKey = parentBase + '[' + repeaterKey + ']';
}

return repeaterKey;
},

setupInstances: function (fieldSet, parentBase) {
if (typeof parentBase === 'undefined' || parentBase === null) {
parentBase = null;
}

var repeaterRow = $( fieldSet ).find( ' > .fieldset-wpum_field_group' ).not( '.fieldset-wpum_field_group-clone' );
var self = this;

if ( !repeaterRow.length ) {
return;
}

self.resetInstance( name );

repeaterRow.each( function( i ) {
$( this ).find('fieldset').attr('data-index', i);
$( this ).find( ':input' ).each( function() {
var name = '';
if ( $( this ).attr( 'data-name' ) ) {
name = $( this ).attr( 'data-name' );
} else {
name = $( this ).prop( 'name' );
}

$( this ).attr(
'name',
name.replace(
new RegExp( /\[(.*?)\]/ ),
function() {
return '[' + i + ']';
}
)
);

if ( i > 0 ) {
var clone_id = '';
if ( $( this ).attr( 'data-clone' ) ) {
clone_id = $( this ).attr( 'data-clone' );
} else {
clone_id = $(this).prop( 'id' );
// Apply parentBase to the fieldset to make it available later
if (parentBase) {
$(fieldSet).attr('data-parent-base', parentBase);
}

var repeaterKey = self.getRepeaterKey(fieldSet);
self.resetInstance(repeaterKey);

repeaterRow.each(function (i) {
$(fieldSet).attr('data-index', i);
$(this)
.find('> fieldset > .field :input')
// Exclude sub repeater fields
.not($(this).find('> fieldset > .fieldset-wpum_field_group :input'))
.each(function() {
var fieldName = $(this).attr('data-name') || $(this).prop('name');
fieldName = fieldName.replace(/\[(.*?)\]/, '[' + i + ']');

// Prepend parentBase if available and does not already have a parentBase
if (parentBase && !fieldName.includes(parentBase)) {
// Wrap the base key (before the first "[") in brackets
fieldName = fieldName.replace(/^([^[]+)/, '[$1]');
fieldName = parentBase + fieldName;
}

var id = clone_id + '_' + i;
$( this ).attr( 'id', id );
$( this ).closest( 'fieldset' ).find( 'label' ).attr( 'for', id );
}
} );
self.increaseInstance( name );
} );
$(this).attr(
'name',
fieldName
);

if (i > 0) {
var clone_id = $(this).attr('data-clone') || $(this).prop('id');
var id = clone_id + '_' + i;
$(this).attr('id', id);
$(this).closest('fieldset').find('label').attr('for', id);
}
});

self.increaseInstance(repeaterKey);

// Recurse into subrepeaters
$(this)
.find('> fieldset > .add-repeater-row')
.each(function () {
var fieldSet = $(this).closest('fieldset');
var currentParentBase = repeaterKey + '[' + i + ']';

self.setupInstances(fieldSet, currentParentBase);
self.validateMaxRows(fieldSet);
});
});
},
validateMaxRows: function( fieldSet ) {
var repeater = $(fieldSet).find( ' > .fieldset-wpum_field_group' ).not( '.fieldset-wpum_field_group-clone' );
var addBtn = $(fieldSet).find( ' > .add-repeater-row' );
var maxRows = addBtn.data('max-row');

validateMaxRows: function( name ) {
var parent = $( '.' + name );
var repeater = parent.find( '.fieldset-wpum_field_group' ).not( '.fieldset-wpum_field_group-clone' );
var addBtn = parent.find( '.add-repeater-row' );
var maxRows = addBtn.data( 'max-row' );
if ( !maxRows || parseInt( maxRows ) < 1 ) {
return true;
}
Expand Down
8 changes: 0 additions & 8 deletions src/fields-editor/settings/field-type-repeater.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,17 +158,9 @@ export default {
this.labels.fields_create = this.labels.repeater_fields_create;
},
created(){
this.repeater = wpumFieldsEditor.fields_types.advanced.fields.find((field) => field.type === 'repeater')
if(this.repeater){
wpumFieldsEditor.fields_types.advanced.fields = wpumFieldsEditor.fields_types.advanced.fields.filter((field) => field.type !== 'repeater')
}

this.getFields()
},
destroyed(){
if(this.repeater){
wpumFieldsEditor.fields_types.advanced.fields.push(this.repeater)
}
this.labels.fields_add_new = this.clonedLabels.fields_add_new;
this.labels.fields_create = this.clonedLabels.fields_create;
}
Expand Down
13 changes: 13 additions & 0 deletions templates/forms/form-registration-fields.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,19 @@

$field = $data->field;
$key = $data->key;

// Parent field should handle the child field rendering
if ( in_array( $field['type'], wpum_get_registered_parent_field_types(), true ) ) {

$field['key'] = $key;
$template = isset( $field['template'] ) ? $field['template'] : $field['type'];

WPUM()->templates
->set_template_data( $field )
->get_template_part( 'form-fields/' . $template, 'field' );
return;
}

if ( ! empty( $field['default_value'] ) ) {
$field['value'] = $field['default_value'];

Expand Down
Loading