diff --git a/openslides/core/static/css/projector.css b/openslides/core/static/css/projector.css index ce5b52ad8..5b2322d2d 100644 --- a/openslides/core/static/css/projector.css +++ b/openslides/core/static/css/projector.css @@ -581,6 +581,7 @@ div.projector-image { background-size: contain; background-repeat: no-repeat; background-position: 50% 50%; + background-color: #fff; } .video-container { diff --git a/openslides/motions/static/js/motions/base.js b/openslides/motions/static/js/motions/base.js index f0e1abaae..4a1f113b2 100644 --- a/openslides/motions/static/js/motions/base.js +++ b/openslides/motions/static/js/motions/base.js @@ -446,7 +446,11 @@ angular.module('OpenSlidesApp.motions', [ * - unsupport * - change_state * - reset_state + * - change_comments * - change_recommendation + * - can_manage + * - can_see_amendments + * - can_create_amendments * * NOTE: If you update this function please think about * server permissions, see motions/views.py. @@ -469,8 +473,6 @@ angular.module('OpenSlidesApp.motions', [ this.state.allow_submitter_edit ) ); - case 'quickedit': - return operator.hasPerms('motions.can_manage'); case 'delete': return operator.hasPerms('motions.can_manage'); case 'create_poll': @@ -492,6 +494,8 @@ angular.module('OpenSlidesApp.motions', [ return operator.hasPerms('motions.can_manage'); case 'reset_state': return operator.hasPerms('motions.can_manage'); + case 'change_comments': + return operator.hasPerms('motions.can_see_and_manage_comments'); case 'change_recommendation': return operator.hasPerms('motions.can_manage'); case 'can_manage': diff --git a/openslides/motions/static/js/motions/motion-services.js b/openslides/motions/static/js/motions/motion-services.js index 7d027791a..fe73bbffb 100644 --- a/openslides/motions/static/js/motions/motion-services.js +++ b/openslides/motions/static/js/motions/motion-services.js @@ -86,24 +86,20 @@ angular.module('OpenSlidesApp.motions.motionservices', ['OpenSlidesApp.motions', }; obj.enable = function () { - if (motion.isAllowed('update')) { - obj.active = true; - obj.isEditable = true; - obj.ckeditorOptions.language = gettextCatalog.getCurrentLanguage(); - obj.editor = CKEDITOR.inline(selector, obj.ckeditorOptions); - obj.editor.on('change', function () { - $timeout(function() { - if (obj.editor.getData() != obj.originalHtml) { - obj.changed = true; - } else { - obj.changed = false; - } - }); + obj.active = true; + obj.isEditable = true; + obj.ckeditorOptions.language = gettextCatalog.getCurrentLanguage(); + obj.editor = CKEDITOR.inline(selector, obj.ckeditorOptions); + obj.editor.on('change', function () { + $timeout(function() { + if (obj.editor.getData() != obj.originalHtml) { + obj.changed = true; + } else { + obj.changed = false; + } }); - obj.revert(); - } else { - obj.disable(); - } + }); + obj.revert(); }; obj.disable = function () { @@ -143,10 +139,6 @@ angular.module('OpenSlidesApp.motions.motionservices', ['OpenSlidesApp.motions', }; obj.save = function () { - if (!motion.isAllowed('update')) { - throw 'No permission to update motion'; - } - saveData(obj); obj.disable(); @@ -195,6 +187,9 @@ angular.module('OpenSlidesApp.motions.motionservices', ['OpenSlidesApp.motions', return motion['comment ' + field.name]; }, function (obj) { + motion.title = motion.getTitle(-1); + motion.text = motion.getText(-1); + motion.reason = motion.getReason(-1); motion['comment ' + field.name] = obj.editor.getData(); } ); diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js index 45cc09935..1d2d84084 100644 --- a/openslides/motions/static/js/motions/site.js +++ b/openslides/motions/static/js/motions/site.js @@ -1289,7 +1289,8 @@ angular.module('OpenSlidesApp.motions.site', [ function (obj) { motion.reason = motion.getReason(-1); motion.setTextStrippingLineBreaks(obj.editor.getData()); - motion.disable_versioning = (obj.trivialChange && Config.get('motions_allow_disable_versioning').value); + motion.disable_versioning = (obj.trivialChange && + Config.get('motions_allow_disable_versioning').value); } ); $scope.commentsInlineEditing = MotionCommentsInlineEditing.createInstances($scope, motion); diff --git a/openslides/motions/static/templates/motions/motion-detail/comments.html b/openslides/motions/static/templates/motions/motion-detail/comments.html index 0977e25a0..aa77119a1 100644 --- a/openslides/motions/static/templates/motions/motion-detail/comments.html +++ b/openslides/motions/static/templates/motions/motion-detail/comments.html @@ -2,7 +2,7 @@
-
+