From 702bc67334ab1aaa4e3b7f7220e96f019cb0584f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= Date: Fri, 24 Aug 2018 16:14:01 +0200 Subject: [PATCH] Change default for motion export dialog. --- openslides/motions/static/js/motions/pdf.js | 1 + openslides/motions/static/js/motions/site.js | 21 ++++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/openslides/motions/static/js/motions/pdf.js b/openslides/motions/static/js/motions/pdf.js index 084ef2f04..ff093ba3d 100644 --- a/openslides/motions/static/js/motions/pdf.js +++ b/openslides/motions/static/js/motions/pdf.js @@ -35,6 +35,7 @@ angular.module('OpenSlidesApp.motions.pdf', ['OpenSlidesApp.core.pdf']) text: true, reason: true, state: true, + category: true, submitters: true, votingresult: true, motionBlock: true, diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js index ecb02d566..384b73ad2 100644 --- a/openslides/motions/static/js/motions/site.js +++ b/openslides/motions/static/js/motions/site.js @@ -854,8 +854,14 @@ angular.module('OpenSlidesApp.motions.site', [ var options = [ {name: gettextCatalog.getString('Submitters'), id: 'submitters', disabled: disabled.submitters}, {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; })) { options.push({ name: gettextCatalog.getString('Category'), @@ -877,13 +883,11 @@ angular.module('OpenSlidesApp.motions.site', [ disabled: disabled.origin, }); } - if (Config.get('motions_recommendations_by').value) { - options.push({ - name: gettextCatalog.getString('Recommendation'), - id: 'recommendation', - disabled: disabled.recommendation - }); - } + options.push({ + name: gettextCatalog.getString('Voting result'), + id: 'votingresult', + disabled: disabled.votingResult + }); return options; }; if (!singleMotion) { @@ -1085,6 +1089,7 @@ angular.module('OpenSlidesApp.motions.site', [ text: true, reason: true, state: true, + category: true, submitters: true, votingresult: true, motionBlock: true,