Skip to content

Fix serialize_from_placeholder() without language gives each placeholders depend languages. #388

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

Fix serialize_from_placeholder() without language gives each placeholders depend languages. #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36026f5
add serialize_from_placeholder(language=language)
haricot Mar 11, 2020
edb391f
add serialize_from_placeholder(language=language)
haricot Mar 11, 2020
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
2 changes: 1 addition & 1 deletion cmsplugin_cascade/clipboard/cms_plugins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ def add_to_clipboard(self, request, form):
placeholder = form.cleaned_data['placeholder']
language = form.cleaned_data['language']
identifier = form.cleaned_data['identifier']
data = serialize_from_placeholder(placeholder)
data = serialize_from_placeholder(placeholder,language=language)
CascadeClipboard.objects.create(
identifier=identifier,
data=data,
Expand Down
5 changes: 2 additions & 3 deletions cmsplugin_cascade/clipboard/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from cmsplugin_cascade.models import CascadeElement


def serialize_from_placeholder(placeholder, admin_site=default_admin_site):
def serialize_from_placeholder(placeholder, admin_site=default_admin_site, language=None):
"""
Create a serialized representation of all the plugins belonging to the clipboard.
"""
Expand All @@ -29,9 +29,8 @@ def populate_data(parent, data):
continue
data.append(entry)
populate_data(child, entry[2])

data = {'plugins': []}
plugin_qs = placeholder.cmsplugin_set.all()
plugin_qs = placeholder.cmsplugin_set.filter(language=language)
populate_data(None, data['plugins'])
return data

Expand Down