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

Merge pull request #1724 from emanuelschuetze/project-item-fix 

Added own isProjected function for Agenda factory (Fixes #1704)
This commit is contained in:
Oskar Hahn 2015-11-30 14:49:17 +01:00
parent ca201758e8 92719f2b31
commit aab8b28393
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openslides/agenda/static/js/agenda/base.js
View File

@ -25,7 +25,8 @@ angular.module('OpenSlidesApp.agenda', ['OpenSlidesApp.users'])
'DS',
'Speaker',
'jsDataModel',
function(DS, Speaker, jsDataModel) {
'Projector',
function(DS, Speaker, jsDataModel, Projector) {
var name = 'agenda/item';
return DS.defineResource({
name: name,
@ -54,6 +55,17 @@ angular.module('OpenSlidesApp.agenda', ['OpenSlidesApp.users'])
this.getContentResource().agendaSupplement || ''
)
);
},
isProjected: function () {
var projector = Projector.get(1);
if (typeof projector === 'undefined') return false;
var self = this;
var predicate = function (element) {
return element.name == self.content_object.collection &&
typeof element.id !== 'undefined' &&
element.id == self.content_object.id;
};
return typeof _.findKey(projector.elements, predicate) === 'string';
}
},
relations: {