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

Merge pull request #3075 from emanuelschuetze/issue3066

Browse Source 
Fixed autoupdate error after deleting a slide (Fixed #3066).
This commit is contained in:
Emanuel Schütze 2017-03-09 08:58:24 +01:00 committed by GitHub
commit 26c9937220
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/agenda/projector.py
View File

@ -65,7 +65,7 @@ class ListOfSpeakersSlide(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 item changes because then we may have new # Full update if item changes because then we may have new
# candidates and therefor need new users. # candidates and therefor need new users.
if collection_element == CollectionElement.from_values(Item.get_collection_string(), config_entry.get('id')): if collection_element.collection_string == Item.get_collection_string() and collection_element.id == config_entry.get('id'):
output.extend(self.get_requirements_as_collection_elements(config_entry)) output.extend(self.get_requirements_as_collection_elements(config_entry))
return output return output

3
openslides/assignments/projector.py
View File

@ -1,5 +1,4 @@
from ..core.exceptions import ProjectorException from ..core.exceptions import ProjectorException
from ..utils.collection import CollectionElement
from ..utils.projector import ProjectorElement from ..utils.projector import ProjectorElement
from .models import Assignment, AssignmentPoll from .models import Assignment, AssignmentPoll
@ -51,7 +50,7 @@ class AssignmentSlide(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 assignment changes because then we may have new # Full update if assignment changes because then we may have new
# candidates and therefor need new users. # candidates and therefor need new users.
if collection_element == CollectionElement.from_values(Assignment.get_collection_string(), config_entry.get('id')): if collection_element.collection_string == Assignment.get_collection_string() and collection_element.id == config_entry.get('id'):
output.extend(self.get_requirements_as_collection_elements(config_entry)) output.extend(self.get_requirements_as_collection_elements(config_entry))
return output return output

3
openslides/motions/projector.py
View File

@ -1,5 +1,4 @@
from ..core.exceptions import ProjectorException from ..core.exceptions import ProjectorException
from ..utils.collection import CollectionElement
from ..utils.projector import ProjectorElement from ..utils.projector import ProjectorElement
from .models import Motion, MotionBlock, MotionChangeRecommendation, Workflow from .models import Motion, MotionBlock, MotionChangeRecommendation, Workflow
@ -35,7 +34,7 @@ class MotionSlide(ProjectorElement):
# #
# Add some logic here if we support live changing of workflows later. # Add some logic here if we support live changing of workflows later.
# #
if collection_element == CollectionElement.from_values(Motion.get_collection_string(), config_entry.get('id')): if collection_element.collection_string == Motion.get_collection_string() and collection_element.id == config_entry.get('id'):
output.extend(self.get_requirements_as_collection_elements(config_entry)) output.extend(self.get_requirements_as_collection_elements(config_entry))
return output return output