Merge pull request #1711 from ostcar/fix_assignment_autoupdate

Angular: Eject assignment related users before a assignment is updated
This commit is contained in:
Norman Jäckel 2015-11-28 13:22:27 +01:00
commit 6dee05328d
2 changed files with 29 additions and 22 deletions

View File

@ -80,6 +80,9 @@ angular.module('OpenSlidesApp.assignments', [])
foreignKey: 'assignment_id', foreignKey: 'assignment_id',
} }
} }
},
beforeInject: function (resource, instance) {
AssignmentRelatedUser.ejectAll({where: {assignment_id: {'==': instance.id}}});
} }
}); });
} }

View File

@ -130,7 +130,10 @@ angular.module('OpenSlidesApp.core', [
} }
]) ])
.factory('jsDataModel', ['$http', 'Projector', function($http, Projector) { .factory('jsDataModel', [
'$http',
'Projector',
function($http, Projector) {
var BaseModel = function() {}; var BaseModel = function() {};
BaseModel.prototype.project = function() { BaseModel.prototype.project = function() {
return $http.post( return $http.post(
@ -152,7 +155,8 @@ angular.module('OpenSlidesApp.core', [
return typeof _.findKey(projector.elements, predicate) === 'string'; return typeof _.findKey(projector.elements, predicate) === 'string';
}; };
return BaseModel; return BaseModel;
}]) }
])
.factory('Customslide', [ .factory('Customslide', [
'DS', 'DS',