ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed message for unblocking users

Browse Source
This commit is contained in:
Oskar Hahn 2012-09-13 21:51:50 +02:00
parent d8136045bb
commit f0f14861e8
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openslides/assignment/views.py
View File

@ -193,7 +193,9 @@ def delrun(request, assignment_id):
except Exception, e: except Exception, e:
messages.error(request, e) messages.error(request, e)
else: else:
messages.success(request, _("You have withdrawn your candidature successfully.") ) messages.success(request,
_("You have withdrawn your candidature successfully. "
"You can not be nominated by other participants anymore."))
else: else:
messages.error(request, _('The candidate list is already closed.')) messages.error(request, _('The candidate list is already closed.'))
@ -204,6 +206,7 @@ def delrun(request, assignment_id):
def delother(request, assignment_id, user_id): def delother(request, assignment_id, user_id):
assignment = Assignment.objects.get(pk=assignment_id) assignment = Assignment.objects.get(pk=assignment_id)
person = get_person(user_id) person = get_person(user_id)
is_blocked = assignment.is_blocked(person)
if request.method == 'POST': if request.method == 'POST':
try: try:
@ -211,11 +214,17 @@ def delother(request, assignment_id, user_id):
except Exception, e: except Exception, e:
messages.error(request, e) messages.error(request, e)
else: else:
messages.success(request, _("Candidate <b>%s</b> was withdrawn successfully.") % (person)) if not is_blocked:
message = _("Candidate <b>%s</b> was withdrawn successfully.") % person
else:
message = _("<b>%s</b> was unblocked successfully.") % person
messages.success(request, message)
else: else:
gen_confirm_form(request, if not is_blocked:
_("Do you really want to withdraw <b>%s</b> from the election?") \ message = _("Do you really want to withdraw <b>%s</b> from the election?") % person
% person, reverse('assignment_delother', args=[assignment_id, user_id])) else:
message = _("Do you really want to unblock <b>%s</b> from the election?") % person
gen_confirm_form(request, message, reverse('assignment_delother', args=[assignment_id, user_id]))
return redirect(reverse('assignment_view', args=[assignment_id])) return redirect(reverse('assignment_view', args=[assignment_id]))