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

Automated merge with ssh://openslides.org/openslides

Browse Source
This commit is contained in:
Emanuel Schuetze 2012-03-06 19:55:26 +01:00
commit 687f5ea710
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openslides/projector/urls.py
View File

@ -12,14 +12,14 @@
from django.conf.urls.defaults import * from django.conf.urls.defaults import *
from projector.views import SettingView, ActivateView from projector.views import ControlView, ActivateView
urlpatterns = patterns('projector.views', urlpatterns = patterns('projector.views',
url(r'^$', 'active_slide', url(r'^$', 'active_slide',
name='projector_show'), name='projector_show'),
url(r'^control$', url(r'^control$',
SettingView.as_view(), ControlView.as_view(),
name='projector_control', name='projector_control',
), ),

4
openslides/projector/views.py
View File

@ -29,11 +29,11 @@ from projector.api import get_active_slide, set_active_slide
from projector.models import SLIDE from projector.models import SLIDE
class SettingView(TemplateView): class ControlView(TemplateView):
template_name = 'projector/control.html' template_name = 'projector/control.html'
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(SettingView, self).get_context_data(**kwargs) context = super(ControlView, self).get_context_data(**kwargs)
categories = {} categories = {}
for slide in SLIDE.values(): for slide in SLIDE.values():
if not categories.has_key(slide.category): if not categories.has_key(slide.category):