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

Merge pull request #3157 from normanjaeckel/FixDeletedReferenceProjector

Browse Source 
Fixed bug when reference projector for list of speakers slide is dele…
This commit is contained in:
Emanuel Schütze 2017-03-28 10:06:12 +02:00 committed by GitHub
commit c4a4773074
1 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openslides/agenda/projector.py
View File

@ -81,8 +81,14 @@ class CurrentListOfSpeakersSlide(ProjectorElement):
def get_requirements(self, config_entry): def get_requirements(self, config_entry):
# The query mechanism on client needs the referenced projector. # The query mechanism on client needs the referenced projector.
try:
reference_projector = Projector.objects.get( reference_projector = Projector.objects.get(
pk=config['projector_currentListOfSpeakers_reference']) pk=config['projector_currentListOfSpeakers_reference'])
except Projector.DoesNotExist:
# Reference projector was deleted so this projector element is empty.
# Skip yielding more requirements (items and speakers).
pass
else:
yield reference_projector yield reference_projector
items = self.get_agenda_items(reference_projector) items = self.get_agenda_items(reference_projector)
@ -106,8 +112,14 @@ class CurrentListOfSpeakersSlide(ProjectorElement):
output = super().get_collection_elements_required_for_this(collection_element, config_entry) output = super().get_collection_elements_required_for_this(collection_element, config_entry)
# Full update if agenda_item or referenced projector changes because # Full update if agenda_item or referenced projector changes because
# then we may have new candidates and therefor need new users. # then we may have new candidates and therefor need new users.
try:
reference_projector = Projector.objects.get( reference_projector = Projector.objects.get(
pk=config['projector_currentListOfSpeakers_reference']) pk=config['projector_currentListOfSpeakers_reference'])
except Projector.DoesNotExist:
# Reference projector was deleted so this projector element is empty.
# Skip appending more stuff to output.
pass
else:
is_reference_projector = collection_element == CollectionElement.from_values( is_reference_projector = collection_element == CollectionElement.from_values(
reference_projector.get_collection_string(), reference_projector.get_collection_string(),
reference_projector.pk) reference_projector.pk)