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

Use origin field in motion detail and list view (Fixes #2227)

Browse Source
This commit is contained in:
Emanuel Schuetze 2016-07-27 16:11:49 +02:00
parent 45321b6139
commit af16733b36
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -446,6 +446,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions'])
motion.getTitle(), motion.getTitle(),
motion.getText(), motion.getText(),
motion.getReason(), motion.getReason(),
motion.origin,
_.map( _.map(
motion.submitters, motion.submitters,
function (submitter) { function (submitter) {

4
openslides/motions/static/templates/motions/motion-detail.html
View File

@ -112,6 +112,10 @@
<div class="label" ng-class="'label-'+motion.state.css_class"> <div class="label" ng-class="'label-'+motion.state.css_class">
{{ motion.state.name | translate }} {{ motion.state.name | translate }}
</div> </div>
<!-- Origin -->
<h3 ng-if="motion.origin" translate>Origin</h3>
{{ motion.origin }}
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<h3 ng-if="motion.polls.length > 0" translate>Voting result</h3> <h3 ng-if="motion.polls.length > 0" translate>Voting result</h3>

6
openslides/motions/static/templates/motions/motion-list.html
View File

@ -165,6 +165,12 @@
<span ng-repeat="tag in motion.tags" class="label label-default"> <span ng-repeat="tag in motion.tags" class="label label-default">
{{ tag.name }} {{ tag.name }}
</span> </span>
<div ng-if="motion.origin">
<small>
<i class="fa fa-info-circle"></i> <translate>Origin</translate>:
{{ motion.origin | limitTo:30 }}{{ motion.origin.length > 30 ? '...' : '' }}
</small>
</div>
<div ng-if="motion.isAllowed('update')" class="hoverActions" ng-class="{'hiddenDiv': !motion.hover}"> <div ng-if="motion.isAllowed('update')" class="hoverActions" ng-class="{'hiddenDiv': !motion.hover}">
<span ng-if="motion.isAllowed('update')"> <span ng-if="motion.isAllowed('update')">
<a href="" ng-click="openDialog(motion)" translate>Edit</a> <a href="" ng-click="openDialog(motion)" translate>Edit</a>