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

manager: fix asset_files export (#71923) #6

Merged
lguerin merged 1 commits from wip/71923-fix-export-assets into main 2022-12-09 08:09:25 +01:00
Conversation 0 Commits 1 Files Changed 2 +7 -3
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
combo/data/utils.py
View File

@ -168,7 +168,7 @@ def import_site(data, if_empty=False, clean=False, request=None):
def export_site_tar(fd, export_kwargs=None):
with tarfile.open(mode='w', fileobj=fd) as tar:
data = export_site(**(export_kwargs or {}))
del data['assets']
data.pop('assets', None)
add_tar_content(tar, '_site.json', json.dumps(data, indent=2))
tar_assets_files(tar)

8
tests/test_manager.py
View File

@ -1111,7 +1111,6 @@ def test_site_export_import_tar(app, admin_user):
assert Asset.objects.filter(key='collectivity:banner').count() == 0
with open('%s/assets/test.png' % path, 'w') as fd:
fd.write('foo')
app = login(app)
resp = app.get('/manage/')
resp = resp.click('Import Site')
resp.form['site_file'] = Upload('site-export.json', site_export, 'application/json')
@ -1124,7 +1123,6 @@ def test_site_export_import_tar(app, admin_user):
assert fd.read() == 'foo'
os.remove('%s/assets/test.png' % path)
app = login(app)
resp = app.get('/manage/')
resp = resp.click('Import Site')
resp.form['site_file'] = Upload('site-export.json', site_export, 'application/json')
@ -1132,6 +1130,12 @@ def test_site_export_import_tar(app, admin_user):
with open('%s/assets/test.png' % path) as fd:
assert fd.read() == 'test'
resp = app.get('/manage/')
resp = resp.click('Export Site')
resp.form['assets'] = False
resp.form['asset_files'] = True
resp = resp.form.submit() # no error
def test_site_export_import_missing_group(app, admin_user):
Page.objects.all().delete()