arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-23 16:32:15 +00:00
Code Issues Projects Releases Wiki Activity

Fixed testEventDetail

Browse Source
This commit is contained in:
David Taylor
2015-06-28 19:02:18 +01:00
parent ebb22e687a
commit ab54809776
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
RIGS/models.py
View File

@@ -53,14 +53,21 @@ class Profile(AbstractUser):
class RevisionMixin(object): class RevisionMixin(object):
@property @property
def last_edited_at(self): def last_edited_at(self):
version = reversion.get_for_object(self)[0] versions = reversion.get_for_object(self)
return version.revision.date_created if versions:
version = reversion.get_for_object(self)[0]
return version.revision.date_created
else:
return None
@property @property
def last_edited_by(self): def last_edited_by(self):
version = reversion.get_for_object(self)[0] versions = reversion.get_for_object(self)
return version.revision.user if versions:
version = reversion.get_for_object(self)[0]
return version.revision.user
else:
return None
@reversion.register @reversion.register
@python_2_unicode_compatible @python_2_unicode_compatible
@@ -75,8 +82,9 @@ class Person(models.Model, RevisionMixin):
def __str__(self): def __str__(self):
string = self.name string = self.name
if len(self.notes) > 0: if self.notes is not None:
string += "*" if len(self.notes) > 0:
string += "*"
return string return string
@property @property
@@ -114,8 +122,9 @@ class Organisation(models.Model, RevisionMixin):
def __str__(self): def __str__(self):
string = self.name string = self.name
if len(self.notes) > 0: if self.notes is not None:
string += "*" if len(self.notes) > 0:
string += "*"
return string return string
@property @property

2
RIGS/test_functional.py
View File

@@ -412,7 +412,7 @@ class EventTest(LiveServerTestCase):
event = models.Event.objects.get(name='Test Event Name') 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) 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(): with transaction.atomic(), reversion.create_revision():
person = models.Person(name="Event Detail Person", email="eventdetail@person.tests.rigs", phone="123 123") person = models.Person(name="Event Detail Person", email="eventdetail@person.tests.rigs", phone="123 123")
person.save() person.save()