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

Added log after adding/removing supporters as manager.

Browse Source
This commit is contained in:
Emanuel Schuetze 2011-09-08 17:39:57 +02:00
parent 85d61d38e5
commit 88447db814
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
openslides/application/views.py
View File

@ -19,6 +19,7 @@ from django.utils.translation import ugettext as _
from openslides.application.models import Application, AVersion from openslides.application.models import Application, AVersion
from openslides.application.forms import ApplicationForm, \ from openslides.application.forms import ApplicationForm, \
ApplicationManagerForm ApplicationManagerForm
from openslides.participant.models import Profile
from openslides.poll.models import Poll from openslides.poll.models import Poll
from openslides.poll.forms import OptionResultForm, PollForm from openslides.poll.forms import OptionResultForm, PollForm
from openslides.utils.utils import template, permission_required, \ from openslides.utils.utils import template, permission_required, \
@ -122,7 +123,11 @@ def edit(request, application_id=None):
if valid: if valid:
del_supporters = True del_supporters = True
original_supporters = []
if is_manager: if is_manager:
if application:
for s in application.supporter.all():
original_supporters.append(s)
application = managerform.save() application = managerform.save()
elif application_id is None: elif application_id is None:
application = Application(submitter=request.user) application = Application(submitter=request.user)
@ -130,6 +135,29 @@ def edit(request, application_id=None):
application.text = dataform.cleaned_data['text'] application.text = dataform.cleaned_data['text']
application.reason = dataform.cleaned_data['reason'] application.reason = dataform.cleaned_data['reason']
application.save(request.user) application.save(request.user)
if is_manager:
# log added supporters
supporters_added = []
for s in application.supporter.all():
if s not in original_supporters:
try:
supporters_added.append(unicode(s.profile))
except Profile.DoesNotExist:
pass
if len(supporters_added) > 0:
log_added = _(", ".join(supporters_added))
application.writelog(_("Supporter: +%s") % log_added, request.user)
# log removed supporters
supporters_removed = []
for s in original_supporters:
if s not in application.supporter.all():
try:
supporters_removed.append(unicode(s.profile))
except Profile.DoesNotExist:
pass
if len(supporters_removed) > 0:
log_removed = _(", ".join(supporters_removed))
application.writelog(_("Supporter: -%s") % log_removed, request.user)
if application_id is None: if application_id is None:
messages.success(request, _('New application was successfully created.')) messages.success(request, _('New application was successfully created.'))
else: else: