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

Merge pull request #3331 from FinnStutzenstein/no-special-comments-in-export

Browse Source 
Hide special comments in export
This commit is contained in:
Emanuel Schütze 2017-07-27 14:36:04 +02:00 committed by GitHub
commit 3c747c01e2
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openslides/motions/static/js/motions/docx.js
View File

@ -155,7 +155,8 @@ angular.module('OpenSlidesApp.motions.docx', ['OpenSlidesApp.core.docx'])
var getMotionComments = function (motion) { var getMotionComments = function (motion) {
var fields = Config.get('motions_comments').value; var fields = Config.get('motions_comments').value;
var canSeeComment = function (index) { var canSeeComment = function (index) {
return fields[index].public || operator.hasPerms('motions.can_manage'); var specialComment = fields[index].forState || fields[index].forRecommendation;
return (fields[index].public || operator.hasPerms('motions.can_manage')) && !specialComment;
}; };
var comments = []; var comments = [];
for (var i = 0; i < fields.length; i++) { for (var i = 0; i < fields.length; i++) {

6
openslides/motions/static/js/motions/pdf.js
View File

@ -300,7 +300,8 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
if (includeComments) { if (includeComments) {
var fields = Config.get('motions_comments').value; var fields = Config.get('motions_comments').value;
var canSeeComment = function (index) { var canSeeComment = function (index) {
return fields[index].public || operator.hasPerms('motions.can_manage'); var specialComment = fields[index].forState || fields[index].forRecommendation;
return (fields[index].public || operator.hasPerms('motions.can_manage')) && !specialComment;
}; };
var comments = []; var comments = [];
for (var i = 0; i < fields.length; i++) { for (var i = 0; i < fields.length; i++) {
@ -962,7 +963,8 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
exportComments: function (motion, filename) { exportComments: function (motion, filename) {
var fields = Config.get('motions_comments').value; var fields = Config.get('motions_comments').value;
var canSeeComment = function (index) { var canSeeComment = function (index) {
return fields[index].public || operator.hasPerms('motions.can_manage'); var specialComment = fields[index].forState || fields[index].forRecommendation;
return (fields[index].public || operator.hasPerms('motions.can_manage')) && !specialComment;
}; };
var content = []; var content = [];
for (var i = 0; i < fields.length; i++) { for (var i = 0; i < fields.length; i++) {