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

Merge pull request #2979 from FinnStutzenstein/Issue2951

Browse Source 
fixing #2951
This commit is contained in:
Norman Jäckel 2017-02-17 16:28:26 +01:00 committed by GitHub
commit ee66ee3d72
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openslides/motions/static/js/motions/site.js
View File

@ -1006,7 +1006,10 @@ angular.module('OpenSlidesApp.motions.site', [
return Projector.lastModified(); return Projector.lastModified();
}, function () { }, function () {
$scope.projectors = Projector.getAll(); $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 () { $scope.$watch(function () {
return Motion.lastModified(motionId); return Motion.lastModified(motionId);
@ -1447,7 +1450,7 @@ angular.module('OpenSlidesApp.motions.site', [
$scope.formFields[i].hide = false; $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) // get state from agenda item (hidden/internal or agenda item)
$scope.formFields[i].defaultValue = !motion.agenda_item.is_hidden; $scope.formFields[i].defaultValue = !motion.agenda_item.is_hidden;
} }