Add first organization title in held position's title

This commit is contained in:
Cédric Messiant 2013-10-08 11:54:29 +02:00
parent b88d586e0a
commit b2ae375df6
2 changed files with 15 additions and 6 deletions

View File

@ -121,7 +121,8 @@ class HeldPosition(Container):
"""The held position's title is constituted by the position's
title and the root organization's title"""
position = self.position.to_object
organization = self.get_organization().get_root_organization()
organization = self.get_organization()
root_organization = organization.get_root_organization()
if position == organization:
if self.label:
return "%s (%s) " % (self.label.encode('utf-8'),
@ -129,8 +130,13 @@ class HeldPosition(Container):
else:
return organization.Title()
else:
return "%s (%s)" % (position.Title(),
organization.Title())
if organization == root_organization:
return "%s (%s)" % (position.Title(),
organization.Title())
else:
return "%s, %s (%s)" % (position.Title(),
organization.Title(),
root_organization.Title())
def get_full_title(self):
"""Returns the 'full title' of the held position.
@ -153,10 +159,10 @@ class HeldPosition(Container):
return u"%s (%s - %s)" % (person_name,
root_organization,
position_name)
def get_person_title(self):
return self.get_person().get_title()
@acqproperty
def photo(self):
"""Get photo from Person"""

View File

@ -27,6 +27,7 @@ class TestContentTypes(unittest.TestCase, BaseTest):
self.regimenth = self.divisionalpha['regimenth']
self.brigadelh = self.regimenth['brigadelh']
self.general_adt = self.armeedeterre['general_adt']
self.sergent_lh = self.brigadelh['sergent_lh']
self.adt = self.degaulle['adt']
self.gadt = self.degaulle['gadt']
self.sergent_pepper = self.pepper['sergent_pepper']
@ -156,6 +157,8 @@ class TestPosition(TestContentTypes):
def test_get_full_title(self):
self.assertEqual(self.general_adt.get_full_title(),
u"Général de l'armée de terre (Armée de terre)")
self.assertEqual(self.sergent_lh.get_full_title(),
u"Sergent de la brigade LH (Brigade LH)")
class TestHeldPosition(TestContentTypes):
@ -174,7 +177,7 @@ class TestHeldPosition(TestContentTypes):
"Général de l'armée de terre (Armée de terre)")
self.assertIn('sergent_pepper', pepper)
self.assertEqual(sergent_pepper.Title(),
"Sergent de la brigade LH (Armée de terre)")
"Sergent de la brigade LH, Brigade LH (Armée de terre)")
self.assertIsNone(sergent_pepper.end_date)
def test_get_full_title(self):