From 20ac817d49679d1313f923f39dd49f485cb8d771 Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Thu, 13 Sep 2012 15:07:24 +0200 Subject: [PATCH] Fixed error message when delrun after the list is closed --- openslides/assignment/views.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py index fdd727eda..4413a1c05 100644 --- a/openslides/assignment/views.py +++ b/openslides/assignment/views.py @@ -187,15 +187,16 @@ def run(request, assignment_id): @login_required def delrun(request, assignment_id): assignment = Assignment.objects.get(pk=assignment_id) - try: - if assignment.status == 'sea' or user.has_perm("assignment.can_manage_assignment"): + if assignment.status == 'sea' or request.user.has_perm("assignment.can_manage_assignment"): + try: assignment.delrun(request.user, blocked=True) + except Exception, e: + messages.error(request, e) else: - messages.error(request, _('The candidate list is already closed.')) - except Exception, e: - messages.error(request, e) + messages.success(request, _("You have withdrawn your candidature successfully.") ) else: - messages.success(request, _("You have withdrawn your candidature successfully.") ) + messages.error(request, _('The candidate list is already closed.')) + return redirect(reverse('assignment_view', args=[assignment_id]))