From 896ac28c301c03d0814a42d8af70ce05d626adde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <openslides@normanjaeckel.de>
Date: Sun, 10 Jan 2016 10:23:55 +0100
Subject: [PATCH 1/2] Added number of candidates to assignment list view.

---
 .../static/templates/assignments/assignment-list.html      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/openslides/assignments/static/templates/assignments/assignment-list.html b/openslides/assignments/static/templates/assignments/assignment-list.html
index 5dfbed6a0..2a1a3d2d8 100644
--- a/openslides/assignments/static/templates/assignments/assignment-list.html
+++ b/openslides/assignments/static/templates/assignments/assignment-list.html
@@ -86,7 +86,7 @@
               ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'">
           </i>
         <th ng-click="toggleSort('open_posts')" class="sortable optional">
-          <translate>Candidates</translate> / <translate>Posts</translate>
+          <translate>Candidates</translate> &middot; <translate>Posts</translate>
           <i class="pull-right fa" ng-show="sortColumn === 'open_posts' && header.sortable != false"
               ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'">
           </i>
@@ -122,7 +122,10 @@
                 ng-bootbox-confirm="Are you sure you want to delete <b>{{ assignment.title }}</b>?"
                 ng-bootbox-confirm-action="delete(assignment)" translate>Delete</a>
           </div>
-        <td ng-if="!assignment.quickEdit" class="optional"><span class="badge">{{ assignment.open_posts }}</span>
+        <td ng-if="!assignment.quickEdit" class="optional">
+          <span class="badge">{{ assignment.assignment_related_users.length }}</span>
+          /
+          <span class="badge">{{ assignment.open_posts }}</span>
         <td ng-if="!assignment.quickEdit" class="optional">
           <span class="label" ng-class="{'label-primary': assignment.phase == 0,
                                          'label-warning': assignment.phase == 1,

From e2145f9777829fc54c8076960295539707e154a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <openslides@normanjaeckel.de>
Date: Sun, 10 Jan 2016 11:27:17 +0100
Subject: [PATCH 2/2] Fixed candidate button.

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

diff --git a/openslides/assignments/static/js/assignments/site.js b/openslides/assignments/static/js/assignments/site.js
index 960b08fcd..393f91d51 100644
--- a/openslides/assignments/static/js/assignments/site.js
+++ b/openslides/assignments/static/js/assignments/site.js
@@ -288,11 +288,12 @@ angular.module('OpenSlidesApp.assignments.site', ['OpenSlidesApp.assignments'])
                     $scope.alert = { type: 'danger', msg: data.detail, show: true };
                 });
         };
-        // check if current user is already a candidate (status=1)
+        // check if current user is already a candidate (elected==false)
         $scope.isCandidate = function () {
             var check = assignment.assignment_related_users.map( function(candidate) {
-                if ( candidate.status == 1)
+                if ( !candidate.elected ) {
                     return candidate.user_id;
+                }
             }).indexOf(operator.user.id);
             if (check > -1)
                 return true;
diff --git a/openslides/assignments/static/templates/assignments/assignment-detail.html b/openslides/assignments/static/templates/assignments/assignment-detail.html
index c47580974..4d6b97885 100644
--- a/openslides/assignments/static/templates/assignments/assignment-detail.html
+++ b/openslides/assignments/static/templates/assignments/assignment-detail.html
@@ -53,7 +53,7 @@
 
   <div class="form-group">
     <alert ng-show="alert.show" type="{{ alert.type }}" ng-click="alert={}" close="alert={}">
-      {{alert.msg}}
+      {{ alert.msg }}
     </alert>
     <div os-perms="assignments.can_nominate_other" class="input-group">
       <ui-select ng-model="candidateSelectBox.selected" ng-change="addCandidate(candidateSelectBox.selected.id)">