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

Fixed missing error/condition ('candidate list already closed') for participants without manager permissions.

Browse Source
This commit is contained in:
Emanuel Schuetze 2012-07-16 22:21:23 +02:00
parent fd6961234a
commit 80d16a2852
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openslides/assignment/models.py
View File

@ -63,18 +63,22 @@ class Assignment(models.Model, SlideMixin):
self.status = status self.status = status
self.save() self.save()
def run(self, profile): def run(self, profile, user=None):
""" """
run for a vote run for a vote
""" """
if self.is_candidate(profile): if self.is_candidate(profile):
raise NameError(_('<b>%s</b> is already a candidate.') % profile) raise NameError(_('<b>%s</b> 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) self.profile.add(profile)
def delrun(self, profile): def delrun(self, profile, user=None):
""" """
stop running for a vote 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): if self.is_candidate(profile):
self.profile.remove(profile) self.profile.remove(profile)
self.elected.remove(profile) self.elected.remove(profile)

18
openslides/assignment/views.py
View File

@ -78,7 +78,7 @@ def view(request, assignment_id=None):
if form.is_valid(): if form.is_valid():
user = form.cleaned_data['candidate'] user = form.cleaned_data['candidate']
try: try:
assignment.run(user) assignment.run(user, request.user)
messages.success(request, _("Candidate <b>%s</b> was nominated successfully.") % (user)) messages.success(request, _("Candidate <b>%s</b> was nominated successfully.") % (user))
except NameError, e: except NameError, e:
messages.error(request, e) messages.error(request, e)
@ -168,7 +168,7 @@ def set_status(request, assignment_id=None, status=None):
def run(request, assignment_id): def run(request, assignment_id):
assignment = Assignment.objects.get(pk=assignment_id) assignment = Assignment.objects.get(pk=assignment_id)
try: try:
assignment.run(request.user.profile) assignment.run(request.user.profile, request.user)
messages.success(request, _('You have set your candidature successfully.') ) messages.success(request, _('You have set your candidature successfully.') )
except NameError, e: except NameError, e:
messages.error(request, e) messages.error(request, e)
@ -181,8 +181,11 @@ def run(request, assignment_id):
@login_required @login_required
def delrun(request, assignment_id): def delrun(request, assignment_id):
assignment = Assignment.objects.get(pk=assignment_id) assignment = Assignment.objects.get(pk=assignment_id)
assignment.delrun(request.user.profile) try:
messages.success(request, _("You have withdrawn your candidature successfully.") ) 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])) 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) profile = Profile.objects.get(pk=profile_id)
if request.method == 'POST': if request.method == 'POST':
assignment.delrun(profile) try:
messages.success(request, _("Candidate <b>%s</b> was withdrawn successfully.") % (profile)) assignment.delrun(profile, request.user)
messages.success(request, _("Candidate <b>%s</b> was withdrawn successfully.") % (profile))
except NameError, e:
messages.error(request, e)
else: else:
gen_confirm_form(request, gen_confirm_form(request,
_("Do you really want to withdraw <b>%s</b> from the election?") \ _("Do you really want to withdraw <b>%s</b> from the election?") \