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

fix: disabled render status after serialization #7650

Merged
merged 4 commits into from
Nov 17, 2023

Conversation

maribethb
Copy link
Contributor

@maribethb maribethb commented Nov 15, 2023

The basics

The details

Resolves

Fixes #7113

Proposed Changes

  • Update the disabled status of a block when it is rendered
  • Removed call to updateDisabled from both XML and JSON serialization, since we do it in render instead
  • Added tests for XML and disabling child / neighbor blocks

Reason for Changes

  • fixing bugs

Test Coverage

Documentation

no

Additional Information

There were a couple different options listed in #7113, but this seemed the most straightforward. I'd like @BeksOmega 's input as I'm not sure if this line was removed intentionally in #7308 or if it was an oversight. If it was removed intentionally then maybe an alternative solution is better.

@maribethb maribethb requested a review from a team as a code owner November 15, 2023 19:37
@maribethb maribethb requested a review from NeilFraser November 15, 2023 19:37
@github-actions github-actions bot added PR: fix Fixes a bug and removed PR: fix Fixes a bug labels Nov 15, 2023
Copy link
Collaborator

@BeksOmega BeksOmega left a comment

Choose a reason for hiding this comment

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

Fix LGTM! My bad for missing this when migrating from render -> renderEfficiently.

tests/mocha/block_test.js Outdated Show resolved Hide resolved
tests/mocha/block_test.js Outdated Show resolved Hide resolved
tests/mocha/block_test.js Outdated Show resolved Hide resolved
@BeksOmega BeksOmega assigned BeksOmega and unassigned NeilFraser Nov 16, 2023
@BeksOmega BeksOmega requested review from BeksOmega and removed request for NeilFraser November 16, 2023 18:19
@maribethb maribethb enabled auto-merge (squash) November 17, 2023 23:58
@maribethb maribethb merged commit e6de858 into google:develop Nov 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR: fix Fixes a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

bug: disabling/enabling blocks not consitent
3 participants