CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

updatestyles: Work around settings propagation to avoid deleting wrong files

Browse Source 
Includes a minor CSS change to trigger a rebuild of all CSS files
This commit is contained in:
Raphael Michel
2021-05-05 22:35:26 +02:00
parent 8c101dc64c
commit 083c257915
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/pretix/presale/style.py
View File

@@ -133,28 +133,30 @@ def delete_old_file(fname):
@app.task(base=TransactionAwareProfiledEventTask) @app.task(base=TransactionAwareProfiledEventTask)
def regenerate_css(event): def regenerate_css(event):
settings = event.settings._cache() # ignore organizer settings
# main.scss # main.scss
css, checksum = compile_scss(event) css, checksum = compile_scss(event)
fname = 'pub/{}/{}/presale.{}.css'.format(event.organizer.slug, event.slug, checksum[:16]) fname = 'pub/{}/{}/presale.{}.css'.format(event.organizer.slug, event.slug, checksum[:16])
if event.settings.get('presale_css_checksum', '') != checksum: if settings.get('presale_css_checksum', '') != checksum:
old_fname = event.settings.get('presale_css_file') if 'presale_css_file' in event.settings._cache() else None old_fname = settings.get('presale_css_file')
newname = default_storage.save(fname, ContentFile(css.encode('utf-8'))) newname = default_storage.save(fname, ContentFile(css.encode('utf-8')))
event.settings.set('presale_css_file', newname) event.settings.set('presale_css_file', newname)
event.settings.set('presale_css_checksum', checksum) event.settings.set('presale_css_checksum', checksum)
if old_fname != newname: if old_fname and old_fname != newname:
delete_old_file(old_fname) delete_old_file(old_fname)
# widget.scss # widget.scss
css, checksum = compile_scss(event, file='widget.scss', fonts=False) css, checksum = compile_scss(event, file='widget.scss', fonts=False)
fname = 'pub/{}/{}/widget.{}.css'.format(event.organizer.slug, event.slug, checksum[:16]) fname = 'pub/{}/{}/widget.{}.css'.format(event.organizer.slug, event.slug, checksum[:16])
if event.settings.get('presale_widget_css_checksum', '') != checksum: if settings.get('presale_widget_css_checksum', '') != checksum:
old_fname = event.settings.get('presale_css_file') if 'presale_widget_css_file' in event.settings._cache() else None old_fname = settings.get('presale_css_file')
newname = default_storage.save(fname, ContentFile(css.encode('utf-8'))) newname = default_storage.save(fname, ContentFile(css.encode('utf-8')))
event.settings.set('presale_widget_css_file', newname) event.settings.set('presale_widget_css_file', newname)
event.settings.set('presale_widget_css_checksum', checksum) event.settings.set('presale_widget_css_checksum', checksum)
if old_fname != newname: if old_fname and old_fname != newname:
delete_old_file(old_fname) delete_old_file(old_fname)

7
src/pretix/static/pretixcontrol/scss/main.scss
View File

@@ -709,13 +709,12 @@ h1 .label {
.withoutjs { .withoutjs {
display: none !important; display: none !important;
} }
.nojs .withoutjs {
display: block !important;
}
.nojs .requirejs { .nojs .requirejs {
display: none !important; display: none !important;
} }
.nojs .withoutjs {
display: block !important;
}
@import "../../pretixbase/scss/_rtl.scss"; @import "../../pretixbase/scss/_rtl.scss";
@import "../../bootstrap/scss/_rtl.scss"; @import "../../bootstrap/scss/_rtl.scss";