From af16733b361bb2bdca8e5cfb1040f74bff55e0b9 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Wed, 27 Jul 2016 16:11:49 +0200
Subject: [PATCH] Use origin field in motion detail and list view (Fixes #2227)

---
 openslides/motions/static/js/motions/site.js                | 1 +
 .../motions/static/templates/motions/motion-detail.html     | 4 ++++
 .../motions/static/templates/motions/motion-list.html       | 6 ++++++
 3 files changed, 11 insertions(+)

diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js
index c9fbd82d2..8f4b0eaf0 100644
--- a/openslides/motions/static/js/motions/site.js
+++ b/openslides/motions/static/js/motions/site.js
@@ -446,6 +446,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions'])
                 motion.getTitle(),
                 motion.getText(),
                 motion.getReason(),
+                motion.origin,
                 _.map(
                     motion.submitters,
                     function (submitter) {
diff --git a/openslides/motions/static/templates/motions/motion-detail.html b/openslides/motions/static/templates/motions/motion-detail.html
index b08b999f1..067a47b94 100644
--- a/openslides/motions/static/templates/motions/motion-detail.html
+++ b/openslides/motions/static/templates/motions/motion-detail.html
@@ -112,6 +112,10 @@
           <div class="label" ng-class="'label-'+motion.state.css_class">
             {{ motion.state.name | translate }}
           </div>
+
+          <!-- Origin -->
+          <h3 ng-if="motion.origin" translate>Origin</h3>
+          {{ motion.origin }}
       </div>
       <div class="col-md-4">
           <h3 ng-if="motion.polls.length > 0" translate>Voting result</h3>
diff --git a/openslides/motions/static/templates/motions/motion-list.html b/openslides/motions/static/templates/motions/motion-list.html
index ce29b290f..d9665c088 100644
--- a/openslides/motions/static/templates/motions/motion-list.html
+++ b/openslides/motions/static/templates/motions/motion-list.html
@@ -165,6 +165,12 @@
             <span ng-repeat="tag in motion.tags" class="label label-default">
               {{ tag.name }}
             </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}">
               <span ng-if="motion.isAllowed('update')">
                 <a href="" ng-click="openDialog(motion)" translate>Edit</a>