Improved motion catalog pdf for one/mutliple motions.
This commit is contained in:
parent
459356bf12
commit
4cd9d20435
15
CHANGELOG
15
CHANGELOG
@ -22,12 +22,6 @@ Motions:
|
|||||||
- Bugfix: changing motion line length did not invalidate cache [#3202]
|
- Bugfix: changing motion line length did not invalidate cache [#3202]
|
||||||
- Bugfix: Added more distance in motion PDF for DEL-tags in new lines [#3211].
|
- Bugfix: Added more distance in motion PDF for DEL-tags in new lines [#3211].
|
||||||
|
|
||||||
Core:
|
|
||||||
- No reload on logoff. OpenSlides is now a full single page
|
|
||||||
application [#3172].
|
|
||||||
- Adding support for choosing image files as logos [#3184, #3207].
|
|
||||||
- Fixing error when clearing empty chat [#3199].
|
|
||||||
|
|
||||||
Users:
|
Users:
|
||||||
- User without permission to see users can now see agenda item speakers,
|
- User without permission to see users can now see agenda item speakers,
|
||||||
motion submitters and supporters, assignment candidates, mediafile
|
motion submitters and supporters, assignment candidates, mediafile
|
||||||
@ -37,6 +31,15 @@ Users:
|
|||||||
e. g. for minimum password length [#3200].
|
e. g. for minimum password length [#3200].
|
||||||
- Fixed compare of duplicated users while csv user import [#3201].
|
- Fixed compare of duplicated users while csv user import [#3201].
|
||||||
|
|
||||||
|
Core:
|
||||||
|
- No reload on logoff. OpenSlides is now a full single page
|
||||||
|
application [#3172].
|
||||||
|
- Adding support for choosing image files as logos [#3184, #3207].
|
||||||
|
- Fixing error when clearing empty chat [#3199].
|
||||||
|
|
||||||
|
General:
|
||||||
|
- Several bugfixes and minor improvements.
|
||||||
|
|
||||||
|
|
||||||
Version 2.1.1 (2017-04-05)
|
Version 2.1.1 (2017-04-05)
|
||||||
==========================
|
==========================
|
||||||
|
@ -177,7 +177,7 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
|
|||||||
}
|
}
|
||||||
|
|
||||||
// summary of change recommendations (for motion diff version only)
|
// summary of change recommendations (for motion diff version only)
|
||||||
if (changeRecommendationMode == "diff") {
|
if (changeRecommendationMode == "diff" && changeRecommendations.length) {
|
||||||
var columnLineNumbers = [];
|
var columnLineNumbers = [];
|
||||||
var columnChangeType = [];
|
var columnChangeType = [];
|
||||||
angular.forEach(_.orderBy(changeRecommendations, ['line_from']), function(change) {
|
angular.forEach(_.orderBy(changeRecommendations, ['line_from']), function(change) {
|
||||||
@ -476,7 +476,7 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
|
|||||||
var createInstance = function(allMotions) {
|
var createInstance = function(allMotions) {
|
||||||
|
|
||||||
var title = PDFLayout.createTitle(
|
var title = PDFLayout.createTitle(
|
||||||
Config.translate(Config.get('motions_export_title').value)
|
Config.translate(Config.get('motions_export_title').value)
|
||||||
);
|
);
|
||||||
|
|
||||||
var createPreamble = function() {
|
var createPreamble = function() {
|
||||||
@ -580,14 +580,18 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
|
|||||||
motionContent.push(PDFLayout.addPageBreak());
|
motionContent.push(PDFLayout.addPageBreak());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
var content = [];
|
||||||
return [
|
// print extra data (title, preamble, categories, toc) only for more than 1 motion
|
||||||
title,
|
if (allMotions.length > 1) {
|
||||||
createPreamble(),
|
content.push(
|
||||||
createTOCategories(),
|
title,
|
||||||
createTOContent(),
|
createPreamble(),
|
||||||
motionContent
|
createTOCategories(),
|
||||||
];
|
createTOContent()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
content.push(motionContent);
|
||||||
|
return content;
|
||||||
};
|
};
|
||||||
return {
|
return {
|
||||||
getContent: getContent
|
getContent: getContent
|
||||||
|
Loading…
Reference in New Issue
Block a user