Skip to content

Commit

Permalink
fixes a revert to live problem
Browse files Browse the repository at this point in the history
  • Loading branch information
digi604 committed Apr 16, 2014
1 parent a4db963 commit b96061d
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 1 deletion.
2 changes: 1 addition & 1 deletion cms/models/pagemodel.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ def _copy_titles(self, target, language, published):
# If an old title exists, overwrite. Otherwise create new
title.pk = old_titles.pop(title.language, None)
title.page = target
title.publisher_is_draft = False
title.publisher_is_draft = target.publisher_is_draft
title.publisher_public_id = old_pk
if published:
title.publisher_state = PUBLISHER_STATE_DEFAULT
Expand Down
22 changes: 22 additions & 0 deletions cms/tests/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,28 @@ def test_publish_page_requires_perms(self):
response = self.admin_class.publish_page(request, Page.objects.all()[0].pk, "en")
self.assertEqual(response.status_code, 403)

def test_revert_page(self):
self.page.publish('en')
title = self.page.title_set.get(language='en')
title.title = 'new'
title.save()
self.assertEqual(Title.objects.all().count(), 2)
self.assertEqual(Page.objects.all().count(), 2)
with self.login_user_context(self.get_superuser()):
request = self.get_request()
request.method = "POST"
response = self.admin_class.revert_page(request, Page.objects.all()[0].pk, "en")
self.assertEqual(response.status_code, 302)
self.assertEqual(Title.objects.all().count(), 2)
self.assertEqual(Page.objects.all().count(), 2)
new_title = Title.objects.get(pk=title.pk)
self.assertNotEqual(title.title, new_title.title)
self.assertTrue(title.publisher_is_draft)
self.assertTrue(new_title.publisher_is_draft)




def test_revert_page_requires_perms(self):
permless = self.get_permless()
with self.login_user_context(permless):
Expand Down

0 comments on commit b96061d

Please sign in to comment.