From 01eb64c1d2477c99a667b7661f9c6c2e48a60492 Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Wed, 6 Nov 2013 17:39:12 +0100 Subject: [PATCH] Update scroll and sale in activate view. Fixes #939 --- openslides/projector/views.py | 4 +++- tests/projector/test_views.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/openslides/projector/views.py b/openslides/projector/views.py index 15048b82a..1f969ea54 100644 --- a/openslides/projector/views.py +++ b/openslides/projector/views.py @@ -88,6 +88,8 @@ class ActivateView(RedirectView): set_active_slide(kwargs['callback'], kwargs=dict(request.GET.items())) config['projector_scroll'] = config.get_default('projector_scroll') config['projector_scale'] = config.get_default('projector_scale') + call_on_projector({'scroll': config['projector_scroll'], + 'scale': config['projector_scale']}) class SelectWidgetsView(TemplateView): @@ -155,7 +157,7 @@ class ProjectorControllView(RedirectView): config['projector_scroll'] = config.get_default('projector_scroll') call_on_projector({'scroll': config['projector_scroll'], - 'scale': config['projector_scale']}) + 'scale': config['projector_scale']}) def get_ajax_context(self, **kwargs): return { diff --git a/tests/projector/test_views.py b/tests/projector/test_views.py index 467293474..ea2673b46 100644 --- a/tests/projector/test_views.py +++ b/tests/projector/test_views.py @@ -41,9 +41,10 @@ class ProjectorViewTest(TestCase): class ActivateViewTest(TestCase): rf = RequestFactory() + @patch('openslides.projector.views.call_on_projector') @patch('openslides.projector.views.config') @patch('openslides.projector.views.set_active_slide') - def test_get(self, mock_set_active_slide, mock_config): + def test_get(self, mock_set_active_slide, mock_config, mock_call_on_projector): view = views.ActivateView() view.request = self.rf.get('/?some_key=some_value') @@ -54,6 +55,7 @@ class ActivateViewTest(TestCase): mock_config.get_default.assert_has_calls([call('projector_scroll'), call('projector_scale')]) self.assertEqual(mock_config.__setitem__.call_count, 2) + self.assertTrue(mock_call_on_projector.called) class SelectWidgetsViewTest(TestCase):