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

Merge pull request #2873 from normanjaeckel/MotionCommentProtection

Browse Source 
Fixed bug in relation for motion comment. Fixed #2568.
This commit is contained in:
Emanuel Schütze 2017-01-15 12:27:17 +01:00 committed by GitHub
commit befff17969
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/core/static/js/core/base.js
View File

@ -230,7 +230,7 @@ angular.module('OpenSlidesApp.core', [
var Resource = DS.definitions[collection]; var Resource = DS.definitions[collection];
if (Resource.relationList) { if (Resource.relationList) {
Resource.relationList.forEach(function (relationDef) { Resource.relationList.forEach(function (relationDef) {
if (relationDef.foreignKey) { if (relationDef.foreignKey && !relationDef.osProtectedRelation) {
var query = {}; var query = {};
query[relationDef.foreignKey] = instance[Resource.idAttribute]; query[relationDef.foreignKey] = instance[Resource.idAttribute];
Resource.getResource(relationDef.relation).ejectAll(query); Resource.getResource(relationDef.relation).ejectAll(query);

1
openslides/motions/static/js/motions/motion-block.js
View File

@ -36,6 +36,7 @@ angular.module('OpenSlidesApp.motions.motionBlock', [])
'motions/motion': { 'motions/motion': {
localField: 'motions', localField: 'motions',
foreignKey: 'motion_block_id', foreignKey: 'motion_block_id',
osProtectedRelation: true,
} }
}, },
} }