From e2145f9777829fc54c8076960295539707e154a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Sun, 10 Jan 2016 11:27:17 +0100 Subject: [PATCH] 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 @@
- {{alert.msg}} + {{ alert.msg }}