From a5398a491c5bfa22a55ac60844d94fd8d150d751 Mon Sep 17 00:00:00 2001 From: FinnStutzenstein Date: Fri, 17 Feb 2017 14:54:32 +0100 Subject: [PATCH] fixing #2951 --- openslides/motions/static/js/motions/site.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js index a37b5fd80..a5a7d7c20 100644 --- a/openslides/motions/static/js/motions/site.js +++ b/openslides/motions/static/js/motions/site.js @@ -1006,7 +1006,10 @@ angular.module('OpenSlidesApp.motions.site', [ return Projector.lastModified(); }, function () { $scope.projectors = Projector.getAll(); - $scope.defaultProjectorId = ProjectionDefault.filter({name: 'motions'})[0].projector_id; + var defaultProjectiondefault = ProjectionDefault.filter({name: 'motions'})[0]; + if (defaultProjectiondefault) { + $scope.defaultProjectorId = defaultProjector.projector_id; + } }); $scope.$watch(function () { return Motion.lastModified(motionId); @@ -1447,7 +1450,7 @@ angular.module('OpenSlidesApp.motions.site', [ $scope.formFields[i].hide = false; } } - if ($scope.formFields[i].key == "showAsAgendaItem") { + if ($scope.formFields[i].key == "showAsAgendaItem" && motion.agenda_item) { // get state from agenda item (hidden/internal or agenda item) $scope.formFields[i].defaultValue = !motion.agenda_item.is_hidden; }