ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3686 from emanuelschuetze/resetScrollLevel

Browse Source 
Reset scroll level for each new projection.
This commit is contained in:
Emanuel Schütze 2018-04-10 13:33:07 +02:00 committed by GitHub
commit 272552055c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -124,6 +124,7 @@ Core:
- Added --debug-email flag to print all emails to stdout [#3530]. - Added --debug-email flag to print all emails to stdout [#3530].
- Added --no-template-caching flag to disable template caching for - Added --no-template-caching flag to disable template caching for
easier development [#3566]. easier development [#3566].
- Reset scroll level for each new projection [#3686].
Mediafiles: Mediafiles:
- New form for uploading multiple files [#3650]. - New form for uploading multiple files [#3650].

4
openslides/core/views.py
View File

@ -272,6 +272,10 @@ class ProjectorViewSet(ModelViewSet):
raise ValidationError({'detail': 'Data must be a list.'}) raise ValidationError({'detail': 'Data must be a list.'})
projector_instance = self.get_object() projector_instance = self.get_object()
# reset scroll level
if (projector_instance.scroll != 0):
projector_instance.scroll = 0
projector_instance.save()
projector_config = {} projector_config = {}
for key, value in projector_instance.config.items(): for key, value in projector_instance.config.items():
if value.get('stable'): if value.get('stable'):