From 8ee76a9a7596b9b3d4ae52b972f77fca192e2278 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Sun, 28 Jun 2015 19:02:18 +0100 Subject: [PATCH] Fixed testEventDetail --- RIGS/models.py | 27 ++++++++++++++++++--------- RIGS/test_functional.py | 2 +- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/RIGS/models.py b/RIGS/models.py index a72255b3..6c4c9c9c 100644 --- a/RIGS/models.py +++ b/RIGS/models.py @@ -53,14 +53,21 @@ class Profile(AbstractUser): class RevisionMixin(object): @property def last_edited_at(self): - version = reversion.get_for_object(self)[0] - return version.revision.date_created + versions = reversion.get_for_object(self) + if versions: + version = reversion.get_for_object(self)[0] + return version.revision.date_created + else: + return None @property def last_edited_by(self): - version = reversion.get_for_object(self)[0] - return version.revision.user - + versions = reversion.get_for_object(self) + if versions: + version = reversion.get_for_object(self)[0] + return version.revision.user + else: + return None @reversion.register @python_2_unicode_compatible @@ -75,8 +82,9 @@ class Person(models.Model, RevisionMixin): def __str__(self): string = self.name - if len(self.notes) > 0: - string += "*" + if self.notes is not None: + if len(self.notes) > 0: + string += "*" return string @property @@ -114,8 +122,9 @@ class Organisation(models.Model, RevisionMixin): def __str__(self): string = self.name - if len(self.notes) > 0: - string += "*" + if self.notes is not None: + if len(self.notes) > 0: + string += "*" return string @property diff --git a/RIGS/test_functional.py b/RIGS/test_functional.py index 24d0a4f2..c9b5c906 100644 --- a/RIGS/test_functional.py +++ b/RIGS/test_functional.py @@ -412,7 +412,7 @@ class EventTest(LiveServerTestCase): event = models.Event.objects.get(name='Test Event Name') self.assertIn("N0000%d | Test Event Name"%event.pk, self.browser.find_element_by_xpath('//h1').text) - def _testEventDetail(self): + def testEventDetail(self): with transaction.atomic(), reversion.create_revision(): person = models.Person(name="Event Detail Person", email="eventdetail@person.tests.rigs", phone="123 123") person.save()