Skip to content

Commit 5b2d738

Browse files
committed
fixed a typo
1 parent a9bfaf1 commit 5b2d738

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

cms/admin/placeholderadmin.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,12 +186,22 @@ def add_plugin(self, request):
186186
@xframe_options_sameorigin
187187
@transaction.commit_on_success
188188
def copy_plugins(self, request):
189+
"""
190+
POST request should have the following data:
191+
192+
- source_language
193+
- source_placeholder_id
194+
- source_plugin_id (optional)
195+
- target_language
196+
- target_placeholder_id
197+
- target_plugin_id (optional, new parent)
198+
"""
189199
source_language = request.POST['source_language']
190200
source_placeholder_id = request.POST['source_placeholder_id']
191201
source_plugin_id = request.POST.get('source_plugin_id', None)
192202
target_language = request.POST['target_language']
193203
target_placeholder_id = request.POST['target_placeholder_id']
194-
target_plugin_id = request.POST.get('target_placeholder_id', None)
204+
target_plugin_id = request.POST.get('target_plugin_id', None)
195205
source_placeholder = get_object_or_404(Placeholder, pk=source_placeholder_id)
196206
target_placeholder = get_object_or_404(Placeholder, pk=target_placeholder_id)
197207
if not target_language or not target_language in get_language_list():

cms/utils/copy_plugins.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ def copy_plugins_to(plugin_list, to_placeholder, to_language=None, parent_plugin
2323
first = False
2424
if parent_plugin_id:
2525
from cms.models import CMSPlugin
26-
new_plugin.move_to(target=CMSPlugin.objects.get(pk=parent_plugin_id))
26+
if parent_plugin_id:
27+
new_plugin.move_to(target=CMSPlugin.objects.get(pk=parent_plugin_id))
2728
plugins_ziplist.append((new_plugin, old_plugin))
2829
# this magic is needed for advanced plugins like Text Plugins that can have
2930
# nested plugins and need to update their content based on the new plugins.

0 commit comments

Comments
 (0)