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 @@
- {{alert.msg}} + {{ alert.msg }}
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'"> - Candidates / Posts + Candidates · Posts @@ -122,7 +122,10 @@ ng-bootbox-confirm="Are you sure you want to delete {{ assignment.title }}?" ng-bootbox-confirm-action="delete(assignment)" translate>Delete
- {{ assignment.open_posts }} + + {{ assignment.assignment_related_users.length }} + / + {{ assignment.open_posts }}