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

Merge pull request #1351 from frauenknecht/i1327_2

Browse Source 
Fix #1327 - Related agenda item has no (auto) agenda number
This commit is contained in:
Oskar Hahn 2014-10-12 11:15:41 +02:00
commit 0f40ce2c81
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openslides/agenda/models.py
View File

@ -163,11 +163,12 @@ class Item(SlideMixin, AbsoluteUrlMixin, MPTTModel):
""" """
Return the title of this item. Return the title of this item.
""" """
item_no = self.item_no
if not self.content_object: if not self.content_object:
item_no = self.item_no
return '%s %s' % (item_no, self.title) if item_no else self.title return '%s %s' % (item_no, self.title) if item_no else self.title
try: try:
return self.content_object.get_agenda_title() agenda_title = self.content_object.get_agenda_title()
return '%s %s' % (item_no, agenda_title) if item_no else agenda_title
except AttributeError: except AttributeError:
raise NotImplementedError('You have to provide a get_agenda_title method on your related model.') raise NotImplementedError('You have to provide a get_agenda_title method on your related model.')