From 80d16a285295d01def74f1aac84fa6d25a04c2c2 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Mon, 16 Jul 2012 22:21:23 +0200 Subject: [PATCH] Fixed missing error/condition ('candidate list already closed') for participants without manager permissions. --- openslides/assignment/models.py | 8 ++++++-- openslides/assignment/views.py | 18 ++++++++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/openslides/assignment/models.py b/openslides/assignment/models.py index f80fb441f..646438616 100644 --- a/openslides/assignment/models.py +++ b/openslides/assignment/models.py @@ -63,18 +63,22 @@ class Assignment(models.Model, SlideMixin): self.status = status self.save() - def run(self, profile): + def run(self, profile, user=None): """ run for a vote """ if self.is_candidate(profile): raise NameError(_('%s is already a candidate.') % profile) + if not user.has_perm("assignment.can_manage_assignment") and self.status != 'sea': + raise NameError(_('The candidate list is already closed.')) self.profile.add(profile) - def delrun(self, profile): + def delrun(self, profile, user=None): """ stop running for a vote """ + if not user.has_perm("assignment.can_manage_assignment") and self.status != 'sea': + raise NameError(_('The candidate list is already closed.')) if self.is_candidate(profile): self.profile.remove(profile) self.elected.remove(profile) diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py index 208eb704b..11f7de3b1 100644 --- a/openslides/assignment/views.py +++ b/openslides/assignment/views.py @@ -78,7 +78,7 @@ def view(request, assignment_id=None): if form.is_valid(): user = form.cleaned_data['candidate'] try: - assignment.run(user) + assignment.run(user, request.user) messages.success(request, _("Candidate %s was nominated successfully.") % (user)) except NameError, e: messages.error(request, e) @@ -168,7 +168,7 @@ def set_status(request, assignment_id=None, status=None): def run(request, assignment_id): assignment = Assignment.objects.get(pk=assignment_id) try: - assignment.run(request.user.profile) + assignment.run(request.user.profile, request.user) messages.success(request, _('You have set your candidature successfully.') ) except NameError, e: messages.error(request, e) @@ -181,8 +181,11 @@ def run(request, assignment_id): @login_required def delrun(request, assignment_id): assignment = Assignment.objects.get(pk=assignment_id) - assignment.delrun(request.user.profile) - messages.success(request, _("You have withdrawn your candidature successfully.") ) + try: + assignment.delrun(request.user.profile, request.user) + messages.success(request, _("You have withdrawn your candidature successfully.") ) + except NameError, e: + messages.error(request, e) return redirect(reverse('assignment_view', args=[assignment_id])) @@ -192,8 +195,11 @@ def delother(request, assignment_id, profile_id): profile = Profile.objects.get(pk=profile_id) if request.method == 'POST': - assignment.delrun(profile) - messages.success(request, _("Candidate %s was withdrawn successfully.") % (profile)) + try: + assignment.delrun(profile, request.user) + messages.success(request, _("Candidate %s was withdrawn successfully.") % (profile)) + except NameError, e: + messages.error(request, e) else: gen_confirm_form(request, _("Do you really want to withdraw %s from the election?") \