Merge pull request #2076 from emanuelschuetze/fixes

Last fixes for 2.0

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'">

openslides/assignments/static/templates/assignments/assignment-detail.html

@@ -75,6 +75,7 @@
   <h3 translate>Description</h3>
   <div class="white-space-pre-line">{{ assignment.description }}</div>
 
+  <div ng-if="assignment.phase != 2">
     <h3 translate>Candidates</h3>
     <ol>
       <li ng-repeat="related_user in assignment.assignment_related_users">
@@ -109,6 +110,7 @@
           <translate>Remove me</translate>
         </button>
     </div>
+  </div>
 
   <h3 translate>Election result</h3>
   <button os-perms="assignments.can_manage" ng-click="createBallot()" class="btn btn-default btn-sm">

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 = '';