diff --git a/openslides/assignments/static/js/assignments/base.js b/openslides/assignments/static/js/assignments/base.js index 55fc428bc..9d1ba9a2e 100644 --- a/openslides/assignments/static/js/assignments/base.js +++ b/openslides/assignments/static/js/assignments/base.js @@ -80,6 +80,9 @@ angular.module('OpenSlidesApp.assignments', []) foreignKey: 'assignment_id', } } + }, + beforeInject: function (resource, instance) { + AssignmentRelatedUser.ejectAll({where: {assignment_id: {'==': instance.id}}}); } }); } diff --git a/openslides/core/static/js/core/base.js b/openslides/core/static/js/core/base.js index 93513afd9..a76aaab94 100644 --- a/openslides/core/static/js/core/base.js +++ b/openslides/core/static/js/core/base.js @@ -130,29 +130,33 @@ angular.module('OpenSlidesApp.core', [ } ]) -.factory('jsDataModel', ['$http', 'Projector', function($http, Projector) { - var BaseModel = function() {}; - BaseModel.prototype.project = function() { - return $http.post( - '/rest/core/projector/1/prune_elements/', - [{name: this.getResourceName(), id: this.id}] - ); - }; - BaseModel.prototype.isProjected = function() { - // Returns true if there is a projector element with the same - // name and the same id. - var projector = Projector.get(1); - if (typeof projector === 'undefined') return false; - var self = this; - var predicate = function (element) { - return element.name == self.getResourceName() && - typeof element.id !== 'undefined' && - element.id == self.id; +.factory('jsDataModel', [ + '$http', + 'Projector', + function($http, Projector) { + var BaseModel = function() {}; + BaseModel.prototype.project = function() { + return $http.post( + '/rest/core/projector/1/prune_elements/', + [{name: this.getResourceName(), id: this.id}] + ); }; - return typeof _.findKey(projector.elements, predicate) === 'string'; - }; - return BaseModel; -}]) + BaseModel.prototype.isProjected = function() { + // Returns true if there is a projector element with the same + // name and the same id. + var projector = Projector.get(1); + if (typeof projector === 'undefined') return false; + var self = this; + var predicate = function (element) { + return element.name == self.getResourceName() && + typeof element.id !== 'undefined' && + element.id == self.id; + }; + return typeof _.findKey(projector.elements, predicate) === 'string'; + }; + return BaseModel; + } +]) .factory('Customslide', [ 'DS',