Skip to content
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.

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

Fluid Field Group Improvements #4030

Merged
merged 16 commits into from
Jun 24, 2024

Conversation

bryannielsen
Copy link
Contributor

@bryannielsen bryannielsen commented Feb 5, 2024

This PR addresses several issues and improvements for handling field groups within a fluid field.

Documentation PR: ExpressionEngine/ExpressionEngine-User-Guide#866

@bryannielsen bryannielsen added this to the 7.x milestone Feb 5, 2024
@bryannielsen bryannielsen self-assigned this Feb 5, 2024
Comment on lines 293 to 296
if(defined('CLONING_MODE') && CLONING_MODE === true && !isset($fluid_field_data[$id])) {
$clonedField = ee('Model')->get('fluid_field:FluidField')->filter('id', $id)->first();
$group_key = 'group_' . $clonedField->group;
}else if (isset($fluid_field_data[$id])) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code is not PSR-12 compatible (needs spaces)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bryannielsen also there are code conflicts to resolve

@intoeetive intoeetive modified the milestones: 7.x, 7.4.3 Feb 19, 2024
Merge pull request #4054 from ExpressionEngine/7.dev
@bryannielsen bryannielsen marked this pull request as draft March 4, 2024 14:29
intoeetive and others added 5 commits March 4, 2024 16:29
Merge pull request #4101 from ExpressionEngine/7.dev
Add new fixed_order and order template parameters to fluid field group's {fields} tag
Resolve some issues with Fluid Field Groups in Live Preview
@bryannielsen bryannielsen force-pushed the feature/7.x/fluid-field-group-improvements branch from 2fedf34 to 1b2d529 Compare March 5, 2024 21:06
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this file have been removed? @bryannielsen

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, I think I missed it in the rebase. I'll put it back 👍

@bryannielsen bryannielsen modified the milestones: 7.4.4, 7.x Mar 7, 2024
@pyrobob83
Copy link

@bryannielsen Is there anything I can do to help with this? I'm happy to test things in a vanilla build if that's helpful.

@bryannielsen bryannielsen marked this pull request as ready for review May 9, 2024 20:07
@TomJaeger TomJaeger modified the milestones: 7.x, 7.5.0 May 9, 2024
@bryannielsen bryannielsen changed the base branch from 7.x to 7.dev May 9, 2024 20:16
@bryannielsen
Copy link
Contributor Author

@pyrobob83 that would be much appreciated if you're willing to do some testing!
I think we're mostly concerned with existing installations and if this change affects the order of how fluid field groups and fields are output in templates.

@pyrobob83
Copy link

@bryannielsen FWIW, this seems to be working as I'd expect it without any adverse effects. I made sure I had multiple field groups available to my fluid field, made sure I had several blocks setup with fully populated content in an entry and noted the presentation on the frontend. Then I manually replaced the 3 core files in the PR - I just overwrote the entire files to makes sure I didn't screw up something:

  • system/ee/ExpressionEngine/Addons/fluid_field/Service/Tag.php
  • system/ee/ExpressionEngine/Addons/fluid_field/ft.fluid_field.php
  • system/ee/legacy/libraries/Fluid_field_parser.php

Then re-checked the presentation and it was identical so proceeded to add a new field to my field groups and those did indeed show up and became usable in existing entries and I was able to reorder the fields inside the field groups and have the order update accordingly on the Publish screen. As far as I can see, this is what we need, though appreciate there could be some edge-case scenarios I'm not testing that could surface issues.

Copy link
Member

@matthewjohns0n matthewjohns0n left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pulled and tested those changes, no issues.

@bryannielsen bryannielsen changed the base branch from 7.dev to release/7.5.0 June 24, 2024 17:56
@bryannielsen bryannielsen merged commit 84bf728 into release/7.5.0 Jun 24, 2024
22 checks passed
@bryannielsen bryannielsen deleted the feature/7.x/fluid-field-group-improvements branch June 24, 2024 18:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants