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

Cleared projector cache if countdown enabled or overlay message changed.

Browse Source
This commit is contained in:
Emanuel Schuetze 2012-10-30 23:45:06 +01:00
parent 3dd5ce9e73
commit 8ffeadfe88
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openslides/projector/views.py
View File

@ -34,7 +34,7 @@ from openslides.config.models import config
from openslides.projector.api import (get_active_slide, set_active_slide, from openslides.projector.api import (get_active_slide, set_active_slide,
projector_message_set, projector_message_delete, get_slide_from_sid, projector_message_set, projector_message_delete, get_slide_from_sid,
get_all_widgets) get_all_widgets, clear_projector_cache)
from openslides.projector.forms import SelectWidgetsForm from openslides.projector.forms import SelectWidgetsForm
from openslides.projector.models import ProjectorOverlay, ProjectorSlide from openslides.projector.models import ProjectorOverlay, ProjectorSlide
from openslides.projector.projector import SLIDE, Widget from openslides.projector.projector import SLIDE, Widget
@ -128,7 +128,9 @@ class Projector(TemplateView, AjaxMixin):
if not data: if not data:
data = self.data data = self.data
cache.set('projector_data', data) cache.set('projector_data', data)
# clear cache if countdown is enabled
if config['countdown_state'] == 'active':
clear_projector_cache()
context = super(Projector, self).get_ajax_context(**kwargs) context = super(Projector, self).get_ajax_context(**kwargs)
content_hash = hash(content) content_hash = hash(content)
context.update({ context.update({
@ -277,6 +279,7 @@ class CountdownEdit(RedirectView):
pass pass
def get_ajax_context(self, **kwargs): def get_ajax_context(self, **kwargs):
clear_projector_cache()
return { return {
'state': config['countdown_state'], 'state': config['countdown_state'],
'countdown_time': config['countdown_time'], 'countdown_time': config['countdown_time'],
@ -299,6 +302,7 @@ class OverlayMessageView(RedirectView):
def get_ajax_context(self, **kwargs): def get_ajax_context(self, **kwargs):
clear_projector_cache()
return { return {
'overlay_message': config['projector_message'], 'overlay_message': config['projector_message'],
} }
@ -330,6 +334,7 @@ class ActivateOverlay(RedirectView):
self.overlay.save() self.overlay.save()
def get_ajax_context(self, **kwargs): def get_ajax_context(self, **kwargs):
clear_projector_cache()
return { return {
'active': self.overlay.active, 'active': self.overlay.active,
'def_name': self.overlay.def_name, 'def_name': self.overlay.def_name,