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

accept old application versions

Browse Source
This commit is contained in:
Oskar Hahn 2011-09-04 10:02:54 +02:00
parent a89bf9f49b
commit 2c6c9b55ee
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openslides/application/models.py
View File

@ -66,11 +66,10 @@ class Application(models.Model):
""" """
accept a Version accept a Version
""" """
if version.id > self.permitted.id: self.permitted = version
self.permitted = version self.save()
self.save() version.rejected = False
return True version.save()
return False
def reject_version(self, version): def reject_version(self, version):
if version.id > self.permitted.id: if version.id > self.permitted.id:

7
openslides/application/views.py
View File

@ -128,7 +128,7 @@ def edit(request, application_id=None):
messages.success(request, _('New application was successfully created.')) messages.success(request, _('New application was successfully created.'))
else: else:
messages.success(request, _('Application was successfully modified.')) messages.success(request, _('Application was successfully modified.'))
if not 'apply' in request.POST: if not 'apply' in request.POST:
return redirect(reverse('application_view', args=[application.id])) return redirect(reverse('application_view', args=[application.id]))
if application_id is None: if application_id is None:
@ -362,10 +362,7 @@ def view_poll(request, poll_id):
def permit_version(request, aversion_id): def permit_version(request, aversion_id):
aversion = AVersion.objects.get(pk=aversion_id) aversion = AVersion.objects.get(pk=aversion_id)
application = aversion.application application = aversion.application
if application.accept_version(aversion): messages.success(request, _("Version accepted") )
messages.success(request, _("Version accepted") )
else:
messages.error(request, _("ERROR by accepting the Version") )
return redirect(reverse('application_view', args=[application.id])) return redirect(reverse('application_view', args=[application.id]))