entrouvert
/
combo
16
1
Fork 0
Code Issues Pull Requests 11 Releases Wiki Activity

misc: don't export cells set on private placeholders (#16476)

This commit is contained in:
Frédéric Péters 2017-10-12 11:18:13 +02:00
parent 0b8b1ba460
commit 30ed33eaf4
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
combo/data/models.py
View File

@ -253,7 +253,7 @@ class Page(models.Model):
return CellBase.get_cells(page_id=self.id)
def get_serialized_page(self):
cells = self.get_cells()
cells = [x for x in self.get_cells() if x.placeholder and not x.placeholder.startswith('_')]
serialized_page = json.loads(serializers.serialize('json', [self],
use_natural_foreign_keys=True, use_natural_primary_keys=True))[0]
del serialized_page['model']

4
tests/test_import_export.py
View File

@ -24,7 +24,7 @@ def some_data():
page.save()
page = Page(title='Three', slug='three')
page.save()
cell = TextCell(page=page, order=0, text='hello world')
cell = TextCell(page=page, order=0, text='hello world', placeholder='content')
cell.save()
@pytest.fixture
@ -112,7 +112,7 @@ def test_import_export_map_layers(app, some_map_layers):
def test_import_export_map_cells(app, some_data, some_map_layers):
page = Page.objects.get(slug='one')
cell = Map(page=page, order=0)
cell = Map(page=page, order=0, placeholder='content')
cell.save()
cell.layers.add(MapLayer.objects.get(slug='foo'))
cell.save()

12
tests/test_pages.py
View File

@ -126,13 +126,13 @@ def test_import_export_pages():
page = Page(title=u'foo', slug='foo', order=0)
page.save()
cell = TextCell(page=page, text='foo', order=0)
cell = TextCell(page=page, text='foo', order=0, placeholder='content')
cell.save()
page2 = Page(title=u'bar', slug='bar', order=1, parent=page)
page2.save()
cell = TextCell(page=page2, text='bar', order=0)
cell = TextCell(page=page2, text='bar', order=0, placeholder='content')
cell.save()
site_export = [x.get_serialized_page() for x in Page.objects.all()]
@ -155,10 +155,10 @@ def test_import_export_pages_with_links():
page2 = Page(title=u'bar', slug='bar', order=1)
page2.save()
cell = LinkCell(page=page, title='bar', link_page=page2, order=1)
cell = LinkCell(page=page, title='bar', placeholder='content', link_page=page2, order=1)
cell.save()
cell2 = LinkCell(page=page2, title='foo', link_page=page, order=1)
cell2 = LinkCell(page=page2, title='foo', placeholder='content', link_page=page, order=1)
cell2.save()
site_export = [x.get_serialized_page() for x in Page.objects.all()]
@ -211,13 +211,13 @@ def test_import_export_management_commands():
page = Page(title=u'foo', slug='foo', order=0)
page.save()
cell = TextCell(page=page, text='foo', order=0)
cell = TextCell(page=page, text='foo', order=0, placeholder='content')
cell.save()
page2 = Page(title=u'bar', slug='bar', order=1, parent=page)
page2.save()
cell = TextCell(page=page2, text='bar', order=0)
cell = TextCell(page=page2, text='bar', order=0, placeholder='content')
cell.save()
export_filename = os.path.join(settings.MEDIA_ROOT, 'site-export.json')