Merge pull request #2712 from emanuelschuetze/fixes
Minor fixes (Fixes #2710)
This commit is contained in:
commit
59599bfba0
@ -39,7 +39,7 @@
|
|||||||
"tinymce-i18n": "OpenSlides/tinymce-i18n#a186ad61e0aa30fdf657e88f405f966d790f0805"
|
"tinymce-i18n": "OpenSlides/tinymce-i18n#a186ad61e0aa30fdf657e88f405f966d790f0805"
|
||||||
},
|
},
|
||||||
"overrides": {
|
"overrides": {
|
||||||
"pdfmake-dist-dist": {
|
"pdfmake-dist": {
|
||||||
"main": [
|
"main": [
|
||||||
"build/pdfmake.min.js",
|
"build/pdfmake.min.js",
|
||||||
"build/vfs_fonts.js"
|
"build/vfs_fonts.js"
|
||||||
|
@ -181,6 +181,8 @@ angular.module('OpenSlidesApp.agenda.site', [
|
|||||||
return operator.hasPerms('agenda.can_see');
|
return operator.hasPerms('agenda.can_see');
|
||||||
case 'motions/motion':
|
case 'motions/motion':
|
||||||
return operator.hasPerms('motions.can_see');
|
return operator.hasPerms('motions.can_see');
|
||||||
|
case 'motions/motion-block':
|
||||||
|
return operator.hasPerms('motions.can_see');
|
||||||
case 'assignments/assignment':
|
case 'assignments/assignment':
|
||||||
return operator.hasPerms('assignments.can_see');
|
return operator.hasPerms('assignments.can_see');
|
||||||
default:
|
default:
|
||||||
|
@ -206,7 +206,7 @@
|
|||||||
<td ng-if="!item.quickEdit" ng-mouseover="item.hover=true" ng-mouseleave="item.hover=false"
|
<td ng-if="!item.quickEdit" ng-mouseover="item.hover=true" ng-mouseleave="item.hover=false"
|
||||||
style="padding-left: calc(8px + {{ item.parentCount }}*15px)">
|
style="padding-left: calc(8px + {{ item.parentCount }}*15px)">
|
||||||
<strong>
|
<strong>
|
||||||
<a ui-sref="{{ item.content_object.collection.replace('/','.') }}.detail({id: item.content_object.id})" ng-show="isAllowedToSeeOpenLink(item)">
|
<a ui-sref="{{ getUpdateStatePrefix(item) }}.detail({id: item.content_object.id})" ng-show="isAllowedToSeeOpenLink(item)">
|
||||||
{{ item.getListViewTitle() }}
|
{{ item.getListViewTitle() }}
|
||||||
</a>
|
</a>
|
||||||
<span ng-hide="isAllowedToSeeOpenLink(item)">
|
<span ng-hide="isAllowedToSeeOpenLink(item)">
|
||||||
|
@ -608,7 +608,7 @@ angular.module('OpenSlidesApp.motions.site', [
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
// supporters
|
// supporters
|
||||||
if (Config.get('motions_min_supporters') > 0) {
|
if (Config.get('motions_min_supporters').value > 0) {
|
||||||
formFields.push({
|
formFields.push({
|
||||||
key: 'supporters_id',
|
key: 'supporters_id',
|
||||||
type: 'select-multiple',
|
type: 'select-multiple',
|
||||||
|
@ -1,4 +1,19 @@
|
|||||||
<div ng-controller="SlideMotionBlockCtrl" class="content scrollcontent">
|
<div ng-controller="SlideMotionBlockCtrl" class="content scrollcontent">
|
||||||
|
<!-- Title -->
|
||||||
|
<div id="title">
|
||||||
<h1>{{ motionBlock.agenda_item.getTitle() }}</h1>
|
<h1>{{ motionBlock.agenda_item.getTitle() }}</h1>
|
||||||
<div ng-repeat="motion in motionBlock.motions">{{ motion.identifier }}</div>
|
<h2 translate>Motion block</h2>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- motion list -->
|
||||||
|
<div style="display: flex; flex-wrap: wrap;">
|
||||||
|
<div ng-repeat="motion in motionBlock.motions" style="width: 33%;">
|
||||||
|
{{ motion.identifier }}
|
||||||
|
<small>
|
||||||
|
<span class="label" ng-class="'label-'+motion.recommendation.css_class">
|
||||||
|
{{ motion.getRecommendationName() }}
|
||||||
|
</span>
|
||||||
|
</small>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user