From 0082410cc8d7846d83afaf9d31444eb28df107bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= <emanuel@intevation.de>
Date: Tue, 21 Mar 2017 13:53:14 +0100
Subject: [PATCH] Fixed assignment JS bugs (Fixed #3099)

---
 openslides/assignments/static/js/assignments/base.js          | 4 ++--
 .../static/templates/assignments/assignment-detail.html       | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/openslides/assignments/static/js/assignments/base.js b/openslides/assignments/static/js/assignments/base.js
index 0b2fddca6..ea529a91a 100644
--- a/openslides/assignments/static/js/assignments/base.js
+++ b/openslides/assignments/static/js/assignments/base.js
@@ -26,7 +26,7 @@ angular.module('OpenSlidesApp.assignments', [])
                         config = Config.get('assignments_poll_100_percent_base').value;
 
                     var base = this.poll.getPercentBase(config);
-                    if (typeof base === 'object') {
+                    if (typeof base === 'object' && base !== null) {
                         // this.poll.pollmethod === 'yna'
                         base = base[this.id];
                     }
@@ -96,7 +96,7 @@ angular.module('OpenSlidesApp.assignments', [])
                     var isReached;
                     var config = Config.get('assignments_poll_100_percent_base').value;
                     var base = this.poll.getPercentBase(config);
-                    if (typeof base === 'object') {
+                    if (typeof base === 'object' && base !== null) {
                         // this.poll.pollmethod === 'yna'
                         base = base[this.id];
                     }
diff --git a/openslides/assignments/static/templates/assignments/assignment-detail.html b/openslides/assignments/static/templates/assignments/assignment-detail.html
index c6f3b8dbc..297bce86d 100644
--- a/openslides/assignments/static/templates/assignments/assignment-detail.html
+++ b/openslides/assignments/static/templates/assignments/assignment-detail.html
@@ -123,7 +123,8 @@
   </div>
 
   <h3 translate>Election result</h3>
-  <button os-perms="assignments.can_manage" ng-click="createBallot()" class="btn btn-default btn-sm">
+  <button os-perms="assignments.can_manage" ng-show="assignment.phase != 2" ng-click="createBallot()"
+      class="btn btn-default btn-sm">
     <i class="fa fa-bar-chart fa-lg"></i>
     <translate>New ballot</translate>
   </button>