From c3fc7d0f1ba4719eb89a322b8f71afc8d323b287 Mon Sep 17 00:00:00 2001 From: FinnStutzenstein Date: Fri, 6 Jan 2017 12:46:18 +0100 Subject: [PATCH] Do not project more than one message --- CHANGELOG | 2 +- openslides/core/static/js/core/base.js | 7 +++++++ .../core/static/templates/core/projector-controls.html | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 125909cd7..e1e42c068 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -31,7 +31,7 @@ Core: - Added template hook system for plugins. - Made a lot of code clean up, improvements and bug fixes in client and backend. -- Use CKEditor for editin projector messages. +- Use CKEditor for editing projector messages. Motions: - Added adjustable line numbering mode (outside, inside, none) for each diff --git a/openslides/core/static/js/core/base.js b/openslides/core/static/js/core/base.js index a6b2ac8f5..bed46f257 100644 --- a/openslides/core/static/js/core/base.js +++ b/openslides/core/static/js/core/base.js @@ -778,6 +778,13 @@ angular.module('OpenSlidesApp.core', [ }); // if it was the same projector before, just delete it but not show again if (_.indexOf(isProjectedIds, projectorId) == -1) { + // Now check whether other messages are already projected and delete them + var elements = Projector.get(projectorId).elements; + _.forEach(elements, function (element, uuid) { + if (element.name === name) { + $http.post('/rest/core/projector/' + projectorId + '/deactivate_elements/', [uuid]); + } + }); return $http.post( '/rest/core/projector/' + projectorId + '/activate_elements/', [{name: name, id: self.id, stable: true}] diff --git a/openslides/core/static/templates/core/projector-controls.html b/openslides/core/static/templates/core/projector-controls.html index 2ca50baaa..a618cbc68 100644 --- a/openslides/core/static/templates/core/projector-controls.html +++ b/openslides/core/static/templates/core/projector-controls.html @@ -61,7 +61,7 @@ -
+