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

Merge pull request #22 from ostcar/master

Browse Source 
Changes on the BV
This commit is contained in:
Oskar Hahn 2012-09-27 11:13:04 -07:00
commit 483baa09ee
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openslides/projector/views.py
View File

@ -73,6 +73,7 @@ class Projector(TemplateView, AjaxMixin):
except AttributeError: #TODO: It has to be an Slide.DoesNotExist except AttributeError: #TODO: It has to be an Slide.DoesNotExist
data = None data = None
ajax = 'on' ajax = 'on'
active_sid = get_active_slide(True)
else: else:
data = get_slide_from_sid(sid) data = get_slide_from_sid(sid)
ajax = 'off' ajax = 'off'
@ -88,7 +89,7 @@ class Projector(TemplateView, AjaxMixin):
# Projector Overlays # Projector Overlays
if self.kwargs['sid'] is None: if self.kwargs['sid'] is None:
active_defs = ProjectorOverlay.objects.filter(active=True) \ active_defs = ProjectorOverlay.objects.filter(active=True) \
.filter(Q(sid=sid) | Q(sid=None)).values_list('def_name', .filter(Q(sid=active_sid) | Q(sid=None)).values_list('def_name',
flat=True) flat=True)
for receiver, response in projector_overlays.send(sender=sid, for receiver, response in projector_overlays.send(sender=sid,
register=False, call=active_defs): register=False, call=active_defs):