From 07d95fd10a580eb4bfe4801ba29d344c75e08f5b Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Tue, 12 Apr 2016 22:26:13 +0200
Subject: [PATCH 1/3] Allow to show vote value '0' in motion poll result view.

---
 openslides/motions/static/js/motions/base.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openslides/motions/static/js/motions/base.js b/openslides/motions/static/js/motions/base.js
index c6fdb80a8..174cf9df1 100644
--- a/openslides/motions/static/js/motions/base.js
+++ b/openslides/motions/static/js/motions/base.js
@@ -68,7 +68,7 @@ angular.module('OpenSlidesApp.motions', ['OpenSlidesApp.users'])
             methods: {
                 // returns object with value and percent
                 getVote: function (vote) {
-                    if (!this.has_votes || !vote) {
+                    if (!this.has_votes) {
                         return;
                     }
                     var value = '';

From f5125d0d23caf303def722237f6dd3b4ad4c98b1 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Tue, 12 Apr 2016 22:33:53 +0200
Subject: [PATCH 2/3] Add content object (motion/election) in agenda sort view.

---
 openslides/agenda/static/templates/agenda/item-sort.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openslides/agenda/static/templates/agenda/item-sort.html b/openslides/agenda/static/templates/agenda/item-sort.html
index 80981ffeb..c320702b3 100644
--- a/openslides/agenda/static/templates/agenda/item-sort.html
+++ b/openslides/agenda/static/templates/agenda/item-sort.html
@@ -26,7 +26,7 @@
 <script type="text/ng-template" id="nodes_renderer.html">
   <div ui-tree-handle>
     <span ng-if="item.item.is_hidden">*</span>
-    {{ item.item.getTitle() }}
+    {{ item.item.getListViewTitle() }}
   </div>
   <ol ui-tree-nodes="" ng-model="item.children">
     <li ng-repeat="item in item.children" ui-tree-node ng-include="'nodes_renderer.html'">

From 7e5ea61b34c596c345792b182993e7b2c1634165 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Tue, 12 Apr 2016 22:41:15 +0200
Subject: [PATCH 3/3] Hide candidate list if assignment phase is finished (2).

---
 .../assignments/assignment-detail.html        | 64 ++++++++++---------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/openslides/assignments/static/templates/assignments/assignment-detail.html b/openslides/assignments/static/templates/assignments/assignment-detail.html
index cd277789f..11e65b8b4 100644
--- a/openslides/assignments/static/templates/assignments/assignment-detail.html
+++ b/openslides/assignments/static/templates/assignments/assignment-detail.html
@@ -75,39 +75,41 @@
   <h3 translate>Description</h3>
   <div class="white-space-pre-line">{{ assignment.description }}</div>
 
-  <h3 translate>Candidates</h3>
-  <ol>
-    <li ng-repeat="related_user in assignment.assignment_related_users">
-      <a ui-sref="users.user.detail({id: related_user.user_id})">{{ related_user.user.get_full_name() }}</a>
-      <i ng-if="related_user.elected" class="fa fa-star" title="{{ 'is elected' | translate }}"></i>
-      <button os-perms="assignments.can_manage" ng-click="removeCandidate(related_user.user_id)"
-          class="btn btn-default btn-xs">
-        <i class="fa fa-times"></i>
-      </button>
-  </ol>
+  <div ng-if="assignment.phase != 2">
+    <h3 translate>Candidates</h3>
+    <ol>
+      <li ng-repeat="related_user in assignment.assignment_related_users">
+        <a ui-sref="users.user.detail({id: related_user.user_id})">{{ related_user.user.get_full_name() }}</a>
+        <i ng-if="related_user.elected" class="fa fa-star" title="{{ 'is elected' | translate }}"></i>
+        <button os-perms="assignments.can_manage" ng-click="removeCandidate(related_user.user_id)"
+            class="btn btn-default btn-xs">
+          <i class="fa fa-times"></i>
+        </button>
+    </ol>
 
-  <div class="form-group">
-    <uib-alert ng-show="alert.show" type="{{ alert.type }}" ng-click="alert={}" close="alert={}">
-      {{ alert.msg }}
-    </uib-alert>
-    <div os-perms="assignments.can_nominate_other">
-      <select chosen ng-model="candidateSelectBox.selected" ng-change="addCandidate(candidateSelectBox.selected)"
-          ng-options="user.id as user.get_full_name() for user in users"
-          search-contains="true"
-          placeholder-text-single="'Select or search a participant ...' | translate"
-          no-results-text="'No results available ...' | translate"
-          class="form-control">
-      <select>
+    <div class="form-group">
+      <uib-alert ng-show="alert.show" type="{{ alert.type }}" ng-click="alert={}" close="alert={}">
+        {{ alert.msg }}
+      </uib-alert>
+      <div os-perms="assignments.can_nominate_other">
+        <select chosen ng-model="candidateSelectBox.selected" ng-change="addCandidate(candidateSelectBox.selected)"
+            ng-options="user.id as user.get_full_name() for user in users"
+            search-contains="true"
+            placeholder-text-single="'Select or search a participant ...' | translate"
+            no-results-text="'No results available ...' | translate"
+            class="form-control">
+        <select>
+      </div>
+      <p os-perms="assignments.can_nominate_self" class="spacer">
+        <button ng-if="!isCandidate()" ng-click="addMe()" class="btn btn-default">
+          <i class="fa fa-plus"></i>
+          <translate>Add me</translate>
+        </button>
+        <button ng-if="isCandidate()" ng-click="removeMe()" class="btn btn-default">
+          <i class="fa fa-minus"></i>
+          <translate>Remove me</translate>
+        </button>
     </div>
-    <p os-perms="assignments.can_nominate_self" class="spacer">
-      <button ng-if="!isCandidate()" ng-click="addMe()" class="btn btn-default">
-        <i class="fa fa-plus"></i>
-        <translate>Add me</translate>
-      </button>
-      <button ng-if="isCandidate()" ng-click="removeMe()" class="btn btn-default">
-        <i class="fa fa-minus"></i>
-        <translate>Remove me</translate>
-      </button>
   </div>
 
   <h3 translate>Election result</h3>