diff --git a/bower.json b/bower.json index 39c4dee98..3e2168d31 100644 --- a/bower.json +++ b/bower.json @@ -39,7 +39,7 @@ "tinymce-i18n": "OpenSlides/tinymce-i18n#a186ad61e0aa30fdf657e88f405f966d790f0805" }, "overrides": { - "pdfmake-dist-dist": { + "pdfmake-dist": { "main": [ "build/pdfmake.min.js", "build/vfs_fonts.js" diff --git a/openslides/agenda/static/js/agenda/site.js b/openslides/agenda/static/js/agenda/site.js index 3f898bfb3..ee1df4c33 100644 --- a/openslides/agenda/static/js/agenda/site.js +++ b/openslides/agenda/static/js/agenda/site.js @@ -181,6 +181,8 @@ angular.module('OpenSlidesApp.agenda.site', [ return operator.hasPerms('agenda.can_see'); case 'motions/motion': return operator.hasPerms('motions.can_see'); + case 'motions/motion-block': + return operator.hasPerms('motions.can_see'); case 'assignments/assignment': return operator.hasPerms('assignments.can_see'); default: diff --git a/openslides/agenda/static/templates/agenda/item-list.html b/openslides/agenda/static/templates/agenda/item-list.html index 71f93c6e8..6861cfec8 100644 --- a/openslides/agenda/static/templates/agenda/item-list.html +++ b/openslides/agenda/static/templates/agenda/item-list.html @@ -206,7 +206,7 @@ - + {{ item.getListViewTitle() }} diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js index 99b016a93..2c2ceecff 100644 --- a/openslides/motions/static/js/motions/site.js +++ b/openslides/motions/static/js/motions/site.js @@ -608,7 +608,7 @@ angular.module('OpenSlidesApp.motions.site', [ }); } // supporters - if (Config.get('motions_min_supporters') > 0) { + if (Config.get('motions_min_supporters').value > 0) { formFields.push({ key: 'supporters_id', type: 'select-multiple', diff --git a/openslides/motions/static/templates/motions/slide_motion_block.html b/openslides/motions/static/templates/motions/slide_motion_block.html index 13982cc3e..4a998945b 100644 --- a/openslides/motions/static/templates/motions/slide_motion_block.html +++ b/openslides/motions/static/templates/motions/slide_motion_block.html @@ -1,4 +1,19 @@
-

{{ motionBlock.agenda_item.getTitle() }}

-
{{ motion.identifier }}
+ +
+

{{ motionBlock.agenda_item.getTitle() }}

+

Motion block

+
+ + +
+
+ {{ motion.identifier }} + + + {{ motion.getRecommendationName() }} + + +
+