From e601ee8e24b03d4ce5c265da678cd7a220e673a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Tue, 29 Nov 2016 16:39:54 +0100 Subject: [PATCH] Fixed trivial change (disable versioning) checkboxes. --- openslides/motions/static/js/motions/motion-services.js | 4 ---- openslides/motions/static/js/motions/site.js | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/openslides/motions/static/js/motions/motion-services.js b/openslides/motions/static/js/motions/motion-services.js index 47a2dd632..ce96638c1 100644 --- a/openslides/motions/static/js/motions/motion-services.js +++ b/openslides/motions/static/js/motions/motion-services.js @@ -78,10 +78,6 @@ angular.module('OpenSlidesApp.motions.motionservices', ['OpenSlidesApp.motions', motion = _motion; obj.lineBrokenText = motion.getTextWithLineBreaks($scope.version); obj.originalHtml = obj.lineBrokenText; - - if (motion.state.versioning && Config.get('motions_allow_disable_versioning').value) { - obj.trivialChange = true; - } }; diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js index d5681fad2..014772df7 100644 --- a/openslides/motions/static/js/motions/site.js +++ b/openslides/motions/static/js/motions/site.js @@ -1457,6 +1457,7 @@ angular.module('OpenSlidesApp.motions.site', [ // set initial values for form model by create deep copy of motion object // so list/detail view is not updated while editing $scope.model = angular.copy(motion); + $scope.model.disable_versioning = false; $scope.model.more = false; // get all form fields @@ -1479,10 +1480,9 @@ angular.module('OpenSlidesApp.motions.site', [ // get reason of latest version $scope.formFields[i].defaultValue = motion.getReason(-1); } - if ($scope.formFields[i].key == "disable_versioning" && - Config.get('motions_allow_disable_versioning')) { - // check current state if versioning is active - if (motion.state.versioning) { + if ($scope.formFields[i].key == "disable_versioning") { + if (Config.get('motions_allow_disable_versioning').value && motion.state.versioning) { + // check current state if versioning is active $scope.formFields[i].hide = false; } }