FIX Duplicate userforms using cascade_duplicates config #1320
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 tasks
GuySartorelli
commented
Aug 21, 2024
Comment on lines
-120
to
-132
| public function duplicate(bool $doWrite = true, array|null $relations = null): static | ||
| { | ||
| $clonedNode = parent::duplicate(true); | ||
|
|
||
| foreach ($this->Options() as $field) { | ||
| $newField = $field->duplicate(false); | ||
| $newField->ParentID = $clonedNode->ID; | ||
| $newField->Version = 0; | ||
| $newField->write(); | ||
| } | ||
|
|
||
| return $clonedNode; | ||
| } |
There was a problem hiding this comment.
This method exists on a superclass so we don't need to deprecate it here
GuySartorelli
commented
Aug 21, 2024
Comment on lines
165
to
169
| /** | ||
| * Temporary storage of field ids when the form is duplicated. | ||
| * Example layout: array('EditableCheckbox3' => 'EditableCheckbox14') | ||
| * @var array | ||
| * Unused property | ||
| * @deprecated 5.3.0 Will be removed without equivalent functionality to replace it | ||
| */ | ||
| protected $fieldsFromTo = []; |
There was a problem hiding this comment.
This isn't referenced anywhere in the code
GuySartorelli
force-pushed
the
pulls/6/duplicate-relations
branch
from
3cd2bd5
to
2575edb
Compare
GuySartorelli
commented
Aug 21, 2024
Comment on lines
-263
to
-268
| foreach ($field->DisplayRules() as $customRule) { | ||
| $newRule = $customRule->duplicate(false); | ||
| $newRule->ParentID = $newField->ID; | ||
| $newRule->Version = 0; | ||
| $newRule->write(); | ||
| } |
There was a problem hiding this comment.
Replaced with $cascade_duplicates on EditableFormField
GuySartorelli
commented
Aug 21, 2024
Comment on lines
-246
to
+249
| $newField->ParentID = $this->owner->ID; | ||
| $newField->ParentClass = $this->owner->ClassName; | ||
| $newField->Version = 0; | ||
| $newField->write(); | ||
| $this->getOwner()->Fields()->add($newField); |
There was a problem hiding this comment.
Matches how this is done in duplicateHasManyRelation which is what we're effectively doing here.
GuySartorelli
commented
Aug 21, 2024
There was a problem hiding this comment.
Changes in the test just output validation error messages when the test fails, so it's easier to see why it failed.
emteknetnz
approved these changes
Aug 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Intentionally targeting
6instead of a patch release because we're changing some API around which always comes with a higher chance of regressions than what we normally release in patches.This PR removes custom duplication logic in favour of the standard
$cascade_duplicatesconfiguration.Issue