From 441c297986eeca7f858d84f739a0074ab9df09b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <openslides@normanjaeckel.de>
Date: Wed, 13 Jan 2016 15:28:30 +0100
Subject: [PATCH] Fixed several things in assignment app. See #1838.

Fixed "Add Me" and "Remove Me" button.

Show poll results for normal users.

Reverse ballot tab order.
---
 openslides/assignments/serializers.py                         | 3 ++-
 .../static/templates/assignments/assignment-detail.html       | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/openslides/assignments/serializers.py b/openslides/assignments/serializers.py
index 6f8c81f9a..8b67ea46b 100644
--- a/openslides/assignments/serializers.py
+++ b/openslides/assignments/serializers.py
@@ -171,7 +171,8 @@ class AssignmentShortPollSerializer(AssignmentAllPollSerializer):
             'options',
             'votesvalid',
             'votesinvalid',
-            'votescast',)
+            'votescast',
+            'has_votes',)
 
 
 class AssignmentFullSerializer(ModelSerializer):
diff --git a/openslides/assignments/static/templates/assignments/assignment-detail.html b/openslides/assignments/static/templates/assignments/assignment-detail.html
index c1c8de64f..edbc6221c 100644
--- a/openslides/assignments/static/templates/assignments/assignment-detail.html
+++ b/openslides/assignments/static/templates/assignments/assignment-detail.html
@@ -73,7 +73,7 @@
         </a>
       </span>
     </div>
-    <p os-perm="assignments.can_nominate_self">
+    <p os-perms="assignments.can_nominate_self">
       <button ng-if="!isCandidate()" ng-click="addMe()" class="btn btn-default">
         <i class="fa fa-plus"></i>
         <translate>Add me</translate>
@@ -91,7 +91,7 @@
   </button>
 
   <uib-tabset class="spacer">
-    <uib-tab ng-repeat="poll in assignment.polls" heading="Ballot {{$index+1}}">
+    <uib-tab ng-repeat="poll in assignment.polls | orderBy:'-id'" heading="Ballot {{ assignment.polls.length - $index }}">
       <div os-perms="assignments.can_manage" class="spacer">
         <!-- angular requires to open the link in new tab with "target='_blank'".
         Otherwise the pdf url can't be open in same window; angular redirects to "/". -->