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

Merge pull request #2389 from emanuelschuetze/motionCommentFixes2

Browse Source 
Motion comment permission fixes on server and client.
This commit is contained in:
Norman Jäckel 2016-09-17 10:58:36 +02:00 committed by GitHub
commit f8610dad96
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openslides/motions/static/js/motions/base.js
View File

@ -315,7 +315,8 @@ angular.module('OpenSlidesApp.motions', [
// Service for generic comment fields
.factory('MotionComment', [
'Config',
function (Config) {
'operator',
function (Config, operator) {
return {
getFields: function () {
// Take input from config field and parse it. It can be some
@ -396,7 +397,7 @@ angular.module('OpenSlidesApp.motions', [
templateOptions: {
label: field.name,
},
hideExpression: '!model.more'
hide: !operator.hasPerms("motions.can_see_and_manage_comments")
};
}
);

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

@ -648,7 +648,9 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions', 'OpenSlid
placeholder: gettextCatalog.getString('Select a parent item ...')
},
hide: !operator.hasPerms('agenda.can_manage')
},
}]
.concat(MotionComment.getFormFields())
.concat([
{
key: 'more',
type: 'checkbox',
@ -708,9 +710,8 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions', 'OpenSlid
placeholder: gettextCatalog.getString('Select or search a supporter ...')
},
hideExpression: '!model.more'
}]
.concat(MotionComment.getFormFields())
.concat([{
},
{
key: 'workflow_id',
type: 'select-single',
templateOptions: {

11
openslides/motions/views.py
View File

@ -106,10 +106,13 @@ class MotionViewSet(ModelViewSet):
self.permission_denied(request)
# Check permission to send comment data.
if (not request.user.has_perm('motions.can_see_and_manage_comments') and
request.data.get('comments')):
# Some users are not allowed to send comments data.
self.permission_denied(request)
if not request.user.has_perm('motions.can_see_and_manage_comments'):
try:
# Ignore comments data if user is not allowed to send comments.
del request.data['comments']
except KeyError:
# No comments here. Just do nothing.
pass
# Validate data and create motion.
serializer = self.get_serializer(data=request.data)