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

Merge pull request #3827 from emanuelschuetze/motion-pdf-default

Browse Source 
Change default for motion export dialog.
This commit is contained in:
Emanuel Schütze 2018-08-24 16:23:22 +02:00 committed by GitHub
commit bec7224c9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,7 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf'])
text: true, text: true,
reason: true, reason: true,
state: true, state: true,
category: true,
submitters: true, submitters: true,
votingresult: true, votingresult: true,
motionBlock: true, motionBlock: true,

17
openslides/motions/static/js/motions/site.js
View File

@ -854,8 +854,14 @@ angular.module('OpenSlidesApp.motions.site', [
var options = [ var options = [
{name: gettextCatalog.getString('Submitters'), id: 'submitters', disabled: disabled.submitters}, {name: gettextCatalog.getString('Submitters'), id: 'submitters', disabled: disabled.submitters},
{name: gettextCatalog.getString('State'), id: 'state', disabled: disabled.state}, {name: gettextCatalog.getString('State'), id: 'state', disabled: disabled.state},
{name: gettextCatalog.getString('Voting result'), id: 'votingresult', disabled: disabled.votingResult}
]; ];
if (Config.get('motions_recommendations_by').value) {
options.push({
name: gettextCatalog.getString('Recommendation'),
id: 'recommendation',
disabled: disabled.recommendation
});
}
if (_.some(motions, function (motion) { return motion.category; })) { if (_.some(motions, function (motion) { return motion.category; })) {
options.push({ options.push({
name: gettextCatalog.getString('Category'), name: gettextCatalog.getString('Category'),
@ -877,13 +883,11 @@ angular.module('OpenSlidesApp.motions.site', [
disabled: disabled.origin, disabled: disabled.origin,
}); });
} }
if (Config.get('motions_recommendations_by').value) {
options.push({ options.push({
name: gettextCatalog.getString('Recommendation'), name: gettextCatalog.getString('Voting result'),
id: 'recommendation', id: 'votingresult',
disabled: disabled.recommendation disabled: disabled.votingResult
}); });
}
return options; return options;
}; };
if (!singleMotion) { if (!singleMotion) {
@ -1085,6 +1089,7 @@ angular.module('OpenSlidesApp.motions.site', [
text: true, text: true,
reason: true, reason: true,
state: true, state: true,
category: true,
submitters: true, submitters: true,
votingresult: true, votingresult: true,
motionBlock: true, motionBlock: true,