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

Restore resource registries eTag [2x] #70

Merged
merged 7 commits into from
Jan 26, 2021

Conversation

mauritsvanrees
Copy link
Sponsor Member

See #65 which is for master

…ries.

Fixes warning "Could not find value adapter for ETag component resourceRegistries".
…rceRegistries removed"

This partially reverts commit b18dedb.

Specifically:

- This reintroduces the resourceRegistries ETag in the various caching profiles.
- Adds documentation for the ETag.
- Adapts the tests to expect content for the ETag.

The tests will need changes though.

The legacy resource registries (portal_css/kss/javascript) are definitely not supported with this revert.
This is only about the "new-style" Plone 5 resource registries in `@@resourceregistry-controlpanel`.
The previous code blindly removed the last etag, assuming it was the time based resourceRegistries ETag.
This is true again, after reintroducing the modernized version of this ETag, but it was not true before.

Moved the two versions of the _normalize_etag function to normalize_etag in test_utils.py.
Fixed it there to only remove the last component when the current year is in it.
Filename needs to be unicode there.
@mister-roboto

This comment has been minimized.

@mauritsvanrees
Copy link
Sponsor Member Author

@jenkins-plone-org please run jobs

Copy link
Sponsor Member

@frapell frapell left a comment

Choose a reason for hiding this comment

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

LGTM !

@frapell frapell merged commit 0315450 into 2.x Jan 26, 2021
@frapell frapell deleted the maurits/restore-resource-registries-2x branch January 26, 2021 13:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants