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

default version is the accepted Version

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

10
openslides/application/models.py
View File

@ -353,13 +353,15 @@ class Application(models.Model):
if name is title, text, reason or time, if name is title, text, reason or time,
Return this attribute from the newest version of the application Return this attribute from the newest version of the application
""" """
if name in ('title', 'text', 'reason', 'time'): if name in ('title', 'text', 'reason', 'time', 'aid'):
try: try:
return self.last_version.__dict__[name] return self.permitted.__dict__[name]
except TypeError: except TypeError:
raise AttributeError(name) return self.last_version.__dict__[name]
#raise AttributeError(name)
except AttributeError: except AttributeError:
raise AttributeError(name) return self.last_version.__dict__[name]
#raise AttributeError(name)
raise AttributeError(name) raise AttributeError(name)
def gen_poll(self, user=None): def gen_poll(self, user=None):

1
openslides/application/views.py
View File

@ -362,6 +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
application.accept_version(aversion)
messages.success(request, _("Version accepted") ) messages.success(request, _("Version accepted") )
return redirect(reverse('application_view', args=[application.id])) return redirect(reverse('application_view', args=[application.id]))