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

Merge pull request #2539 from CatoTH/bugfix-open-motions-in-original-view

Browse Source 
Bugfix: Always open motions in original view
This commit is contained in:
Norman Jäckel 2016-11-01 22:56:33 +01:00 committed by GitHub
commit b0ff8375a8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openslides/motions/static/js/motions/motion-services.js
View File

@ -452,7 +452,7 @@ angular.module('OpenSlidesApp.motions.motionservices', ['OpenSlidesApp.motions',
}, 0, false); }, 0, false);
}; };
obj.init = function (_scope) { obj.init = function (_scope, viewMode) {
$scope = _scope; $scope = _scope;
$scope.$evalAsync(function() { $scope.$evalAsync(function() {
obj.repositionOriginalAnnotations(); obj.repositionOriginalAnnotations();
@ -477,6 +477,8 @@ angular.module('OpenSlidesApp.motions.motionservices', ['OpenSlidesApp.motions',
$scope.$on('$destroy', function() { $scope.$on('$destroy', function() {
$interval.cancel(sizeChecker); $interval.cancel(sizeChecker);
}); });
obj.mode = viewMode;
}; };
return obj; return obj;

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

@ -1200,7 +1200,7 @@ angular.module('OpenSlidesApp.motions.site', [
// Change recommendation viewing // Change recommendation viewing
$scope.viewChangeRecommendations = ChangeRecommmendationView; $scope.viewChangeRecommendations = ChangeRecommmendationView;
$scope.viewChangeRecommendations.init($scope); $scope.viewChangeRecommendations.init($scope, 'original');
// PDF creating functions // PDF creating functions
$scope.pdfExport = MotionPDFExport; $scope.pdfExport = MotionPDFExport;