Fix placeholder_conf when overriding with empty parent_classes or empty child_classes #3372
Conversation
This file contains hidden or 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
Fixes bug which made it impossible to add plugins, with placeholder.pk>=1000. Reason was, that placeholder.pk got a thousand separator.
Conflicts: cms/templates/admin/cms/page/widgets/plugin_editor.html
|
I don't understand from where the travis failures with python 3.4 are coming from |
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.
This fixes the following issue:
In the app's
settings.py.CMS_PLACEHOLDER_CONFoverridechild_classesorparent_classesof a placeholder config. If the plugin defined those classes, but in the settings it shall be overridden by an empty list, this is not possible, because the expression is evaluated for truethness instead of checking for an empty list.Changeset: 1964b12
Additionally I fixed many PEP8 issues in that file.
Changeset: 3b444a5