Skip to content

[6.x] Add site-specific statuses to Matrix entries - #19686

Merged
brandonkelly merged 12 commits into
6.xfrom
cms-1383
Sep 23, 2026
Merged

brandonkelly merged 12 commits into
6.xfrom
cms-1383

Conversation

@riasvdv

@riasvdv riasvdv commented Sep 22, 2026

Copy link
Copy Markdown
Contributor

Description

Adds independent site and global status controls for localized Matrix entries across both the Form API and legacy Matrix interfaces.

Matrix entry status
├── Current site (`enabledForSite`)
└── All sites (`enabled`)

Status indicators now identify whether an entry is disabled for the current site or globally. Bulk actions resolve against the complete selection and avoid offering site-level changes when globally disabled entries are selected.

Related issues

@linear-code

linear-code Bot commented Sep 22, 2026

Copy link
Copy Markdown
Contributor

CMS-1383

@github-actions

github-actions Bot commented Sep 22, 2026 •

Copy link
Copy Markdown

📚 Storybook previews

@craftcms/ui — open Storybook

No changed components detected in this Storybook.

resources/js — open Storybook

No changed components detected in this Storybook.

@riasvdv
riasvdv marked this pull request as draft September 22, 2026 07:13
@riasvdv
riasvdv marked this pull request as ready for review September 22, 2026 07:40
@github-actions

Copy link
Copy Markdown

This PR had conflicts with 6.x. Claude attempted an automatic resolution and pushed a merge commit. Please review the merge commit carefully before approving/merging.

Claude's response

I resolved the merge, committed it as 45f1e96 and pushed it to cms-1383. I didn't run any tests; the only edit was to the changelog.

The only file with conflicts was CHANGELOG.md, in the "Fields" section. Both sides had added a line in the same spot:

These are separate features, so I kept both entries and put them in alphabetical order. Nothing was ambiguous, so I didn't add any CONFLICT-REVIEW comments. Git merged all the other files automatically.

@brandonkelly
brandonkelly merged commit 6d5ab9a into 6.x Sep 23, 2026
23 checks passed
@brandonkelly
brandonkelly deleted the cms-1383 branch September 23, 2026 23:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants