From d800a781a52ce15cadd79e8836ec906cd2dfd74e Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Thu, 2 Jul 2020 20:13:24 +0100 Subject: [PATCH] Fixes to revisions for RAs --- RIGS/models.py | 10 ++++++++-- versioning/__init__.py | 0 versioning/templates/partials/last_edited.html | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 versioning/__init__.py diff --git a/RIGS/models.py b/RIGS/models.py index 8b766edd..5c5ff45d 100644 --- a/RIGS/models.py +++ b/RIGS/models.py @@ -65,8 +65,13 @@ class Profile(AbstractUser): def __str__(self): return self.name - +# TODO move to versioning - currently get import errors with that class RevisionMixin(object): + @property + def is_first_version(self): + versions = Version.objects.get_for_object(self) + return len(versions) == 1 + @property def current_version(self): version = Version.objects.get_for_object(self).select_related('revision').first() @@ -94,6 +99,7 @@ class RevisionMixin(object): return "V{0} | R{1}".format(version.pk, version.revision.pk) + class Person(models.Model, RevisionMixin): name = models.CharField(max_length=50) phone = models.CharField(max_length=15, blank=True, null=True) @@ -570,7 +576,7 @@ class Payment(models.Model): @reversion.register -class RiskAssessment(models.Model): +class RiskAssessment(models.Model, RevisionMixin): event = models.OneToOneField('Event', on_delete=models.CASCADE) # General nonstandard_equipment = models.BooleanField(help_text="Does the event require any hired in equipment or use of equipment that is not covered by TEC's standard risk assessments and method statements?") diff --git a/versioning/__init__.py b/versioning/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/versioning/templates/partials/last_edited.html b/versioning/templates/partials/last_edited.html index 274b226e..10d74706 100644 --- a/versioning/templates/partials/last_edited.html +++ b/versioning/templates/partials/last_edited.html @@ -1,5 +1,5 @@
- Last edited {{ object.last_edited_at|default:'never' }} by {{ object.last_edited_by.name|default:'System' }} + {% if object.is_first_version %}Created{% else %}Last edited{% endif %} {{ object.last_edited_at|default:'never' }} by {{ object.last_edited_by.name|default:'System' }}