From f086d055b6bcd96fa674d6b23afa010e70349fa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Sun, 15 Jan 2017 10:20:45 +0100 Subject: [PATCH] Fixed bug in relation for motion comment. Fixed #2568. --- openslides/core/static/js/core/base.js | 2 +- openslides/motions/static/js/motions/motion-block.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/openslides/core/static/js/core/base.js b/openslides/core/static/js/core/base.js index 1dea1621a..b83f5ec29 100644 --- a/openslides/core/static/js/core/base.js +++ b/openslides/core/static/js/core/base.js @@ -230,7 +230,7 @@ angular.module('OpenSlidesApp.core', [ var Resource = DS.definitions[collection]; if (Resource.relationList) { Resource.relationList.forEach(function (relationDef) { - if (relationDef.foreignKey) { + if (relationDef.foreignKey && !relationDef.osProtectedRelation) { var query = {}; query[relationDef.foreignKey] = instance[Resource.idAttribute]; Resource.getResource(relationDef.relation).ejectAll(query); diff --git a/openslides/motions/static/js/motions/motion-block.js b/openslides/motions/static/js/motions/motion-block.js index 19e596b23..fcd2d0774 100644 --- a/openslides/motions/static/js/motions/motion-block.js +++ b/openslides/motions/static/js/motions/motion-block.js @@ -36,6 +36,7 @@ angular.module('OpenSlidesApp.motions.motionBlock', []) 'motions/motion': { localField: 'motions', foreignKey: 'motion_block_id', + osProtectedRelation: true, } }, }