Skip to content

RelationController behavior: support for deeply nested relations #1499

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

RelationController behavior: support for deeply nested relations #1499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3a13b74
add changed to RelationController behavior to support deeply nested r…
mjauvin Jul 6, 2026
2c63572
regenerate storm-min.j
mjauvin Jul 6, 2026
8a1b4c2
Stale offset persists after popup is reused with a lower stack depth
mjauvin Jul 6, 2026
23ccc71
regenerate js assets
mjauvin Jul 6, 2026
5decd00
add fix/test for potential attach vector found by coderabbit
mjauvin Jul 6, 2026
0825c7d
fix originalConfig mutation and add regression tests
mjauvin Jul 6, 2026
c92f389
add comments to explain the field possible values
mjauvin Jul 6, 2026
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
578 changes: 561 additions & 17 deletions modules/backend/behaviors/RelationController.php
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions modules/backend/behaviors/relationcontroller/partials/_button_delete.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
class="btn btn-sm btn-secondary wn-icon-trash-o"
data-request="onRelationButtonDelete"
data-request-confirm="<?= e(trans('backend::lang.relation.delete_confirm')) ?>"
data-request-success="$.wn.relationBehavior.changed('<?= e($relationField) ?>', 'deleted')"
data-request-success="$.wn.relationBehavior.changed('<?= e($relationFieldName) ?>', 'deleted')"
data-stripe-load-indicator>
<?= e(trans($text)) ?>
</button>
Expand All @@ -16,7 +16,7 @@ class="btn btn-sm btn-secondary wn-icon-trash-o"
disabled="disabled"
data-request="onRelationButtonDelete"
data-request-confirm="<?= e(trans('backend::lang.relation.delete_confirm')) ?>"
data-request-success="$.wn.relationBehavior.changed('<?= e($relationField) ?>', 'deleted')"
data-request-success="$.wn.relationBehavior.changed('<?= e($relationFieldName) ?>', 'deleted')"
data-trigger-action="enable"
data-trigger="#<?= $this->relationGetId('view') ?> .control-list input[type=checkbox]"
data-trigger-condition="checked"
Expand Down
4 changes: 2 additions & 2 deletions modules/backend/behaviors/relationcontroller/partials/_button_remove.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<button
class="btn btn-sm btn-secondary wn-icon-minus"
data-request="onRelationButtonRemove"
data-request-success="$.wn.relationBehavior.changed('<?= e($relationField) ?>', 'removed')"
data-request-success="$.wn.relationBehavior.changed('<?= e($relationFieldName) ?>', 'removed')"
data-stripe-load-indicator>
<?= e(trans($text)) ?>
</button>
Expand All @@ -14,7 +14,7 @@ class="btn btn-sm btn-secondary wn-icon-minus"
})"
disabled="disabled"
data-request="onRelationButtonRemove"
data-request-success="$.wn.relationBehavior.changed('<?= e($relationField) ?>', 'removed')"
data-request-success="$.wn.relationBehavior.changed('<?= e($relationFieldName) ?>', 'removed')"
data-trigger-action="enable"
data-trigger="#<?= $this->relationGetId('view') ?> .control-list input[type=checkbox]"
data-trigger-condition="checked"
Expand Down
2 changes: 1 addition & 1 deletion modules/backend/behaviors/relationcontroller/partials/_button_unlink.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
href="javascript:;"
class="btn btn-sm btn-secondary wn-icon-unlink"
data-request="onRelationButtonUnlink"
data-request-success="$.wn.relationBehavior.changed('<?= e($relationField) ?>', 'removed')"
data-request-success="$.wn.relationBehavior.changed('<?= e($relationFieldName) ?>', 'removed')"
data-request-confirm="<?= e(trans('backend::lang.relation.unlink_confirm')) ?>"
data-stripe-load-indicator>
<?= e(trans($text)) ?>
Expand Down
14 changes: 14 additions & 0 deletions modules/backend/formwidgets/RelationManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,20 @@ public function render()

$relation = $this->relation ?: $this->formField->fieldName;

// Explicitly binds the controller's relation context to THIS
// widget's own model/field pair before rendering. Needed for a
// nested relation manager (one rendered inside another relation
// manager's own manage form): without this, relationRender()'s
// own internal validateField() check would lazily call
// initRelation() using $this->model - RelationController's own,
// currently-active model, which for a nested field is still
// whatever the OUTER field left it as, not this widget's own
// bound model. Harmless and idempotent for a root-level field
// (the widget's model and the controller's current model are
// already the same one), so this applies at any depth
// uniformly, with no special-casing needed here.
$this->controller->initRelation($this->model, $relation);

return $this->controller->relationRender($relation, $options);
}

Expand Down
Loading
Loading