Skip to content

Commit

Permalink
Merge pull request #4361 from yakky/feature/fix_4038
Browse files Browse the repository at this point in the history
Really fix #4038
  • Loading branch information
yakky committed Aug 15, 2015
2 parents 5eed528 + 1ad9f7f commit db80429
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion cms/admin/pageadmin.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ def save_model(self, request, obj, form, change):
obj = Page.objects.get(pk=obj.pk) #mptt reload
copy_target._copy_attributes(obj, clean=True)
obj.save()
for lang in copy_target.languages.split(','):
for lang in copy_target.get_languages():
copy_target._copy_contents(obj, lang)
if 'permission' not in request.path_info:
language = form.cleaned_data['language']
Expand Down
2 changes: 1 addition & 1 deletion cms/extensions/extension_pool.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def _copy_title_extensions(self, source_page, target_page, language, clone=False

def copy_extensions(self, source_page, target_page, languages=None):
if not languages:
languages = source_page.get_languages()
languages = target_page.get_languages()
if self.page_extensions:
self._copy_page_extensions(source_page, target_page, None, clone=True)
self._remove_orphaned_page_extensions()
Expand Down
5 changes: 3 additions & 2 deletions cms/tests/extensions.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from django.contrib.auth.models import Permission
from django.contrib.sites.models import Site

from cms.api import create_page
from cms.api import create_page, create_title
from cms.constants import PUBLISHER_STATE_DIRTY
from cms.extensions import extension_pool
from cms.extensions import TitleExtension
Expand Down Expand Up @@ -220,7 +220,8 @@ def setUp(self):
self.page = create_page(
'My Extension Page', 'nav_playground.html', 'en',
site=self.site, created_by=self.admin)
self.page_title = self.page.get_title_obj()
self.page_title = self.page.get_title_obj('en')
create_title('de', 'de title', self.page)
self.page_extension = MyPageExtension.objects.create(
extended_object=self.page,
extra="page extension text")
Expand Down

0 comments on commit db80429

Please sign in to comment.