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

Merge pull request #2878 from FinnStutzenstein/MotionProjectFix

Browse Source 
Hotfix for motion projection
This commit is contained in:
Emanuel Schütze 2017-01-15 13:42:06 +01:00 committed by GitHub
commit e9e0280a13
1 changed files with 6 additions and 1 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

@ -1075,6 +1075,7 @@ angular.module('OpenSlidesApp.motions.site', [
.controller('MotionDetailCtrl', [ .controller('MotionDetailCtrl', [
'$scope', '$scope',
'$http', '$http',
'$timeout',
'operator', 'operator',
'ngDialog', 'ngDialog',
'MotionForm', 'MotionForm',
@ -1095,7 +1096,7 @@ angular.module('OpenSlidesApp.motions.site', [
'MotionCommentsInlineEditing', 'MotionCommentsInlineEditing',
'Projector', 'Projector',
'ProjectionDefault', 'ProjectionDefault',
function($scope, $http, operator, ngDialog, MotionForm, function($scope, $http, $timeout, operator, ngDialog, MotionForm,
ChangeRecommmendationCreate, ChangeRecommmendationView, MotionChangeRecommendation, MotionPDFExport, ChangeRecommmendationCreate, ChangeRecommmendationView, MotionChangeRecommendation, MotionPDFExport,
Motion, MotionComment, Category, Mediafile, Tag, User, Workflow, Config, motion, MotionInlineEditing, Motion, MotionComment, Category, Mediafile, Tag, User, Workflow, Config, motion, MotionInlineEditing,
MotionCommentsInlineEditing, Projector, ProjectionDefault) { MotionCommentsInlineEditing, Projector, ProjectionDefault) {
@ -1155,12 +1156,16 @@ angular.module('OpenSlidesApp.motions.site', [
} }
}; };
$scope.projectionMode = getProjectionMode(); $scope.projectionMode = getProjectionMode();
// TODO: Fix this timeout; check what mode is projected.
$scope.setProjectionMode = function (mode) { $scope.setProjectionMode = function (mode) {
$scope.projectionMode = mode; $scope.projectionMode = mode;
var projectedIds = motion.isProjected(); var projectedIds = motion.isProjected();
_.forEach(projectedIds, function (id) { _.forEach(projectedIds, function (id) {
motion.project(id, mode.mode); motion.project(id, mode.mode);
$timeout(function () {
motion.project(id, mode.mode);
}, 100);
}); });
}; };
$scope.commentsFields = Config.get('motions_comments').value; $scope.commentsFields = Config.get('motions_comments').value;