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

Merge pull request #3314 from FinnStutzenstein/Bugfixes

Browse Source 
Minor Bugfixes (fixes #3312, fixes #3313)
This commit is contained in:
Norman Jäckel 2017-06-29 10:45:13 +02:00 committed by GitHub
commit 1701fd72f2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openslides/motions/static/js/motions/base.js
View File

@ -613,7 +613,11 @@ angular.module('OpenSlidesApp.motions', [
}, },
isRelatedProjected: function () { isRelatedProjected: function () {
// A motion related object is the list of speakers (through the agenda item) // A motion related object is the list of speakers (through the agenda item)
if (this.agenda_item) {
return this.agenda_item.isListOfSpeakersProjected(); return this.agenda_item.isListOfSpeakersProjected();
} else {
return [];
}
}, },
}, },
relations: { relations: {

3
openslides/motions/static/js/motions/pdf.js
View File

@ -375,11 +375,12 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
.factory('MotionPartialContentProvider', [ .factory('MotionPartialContentProvider', [
'$q', '$q',
'gettextCatalog', 'gettextCatalog',
'Config',
'PDFLayout', 'PDFLayout',
'PdfMakeConverter', 'PdfMakeConverter',
'ImageConverter', 'ImageConverter',
'HTMLValidizer', 'HTMLValidizer',
function ($q, gettextCatalog, PDFLayout, PdfMakeConverter, ImageConverter, HTMLValidizer) { function ($q, gettextCatalog, Config, PDFLayout, PdfMakeConverter, ImageConverter, HTMLValidizer) {
/* /*
* content should be an array of content blocks. Each content is an object providing a * content should be an array of content blocks. Each content is an object providing a
* heading and a text. E.g. * heading and a text. E.g.