mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-17 05:22:16 +00:00
Fixes to revisions for RAs
This commit is contained in:
@@ -65,8 +65,13 @@ class Profile(AbstractUser):
|
|||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.name
|
return self.name
|
||||||
|
|
||||||
|
# TODO move to versioning - currently get import errors with that
|
||||||
class RevisionMixin(object):
|
class RevisionMixin(object):
|
||||||
|
@property
|
||||||
|
def is_first_version(self):
|
||||||
|
versions = Version.objects.get_for_object(self)
|
||||||
|
return len(versions) == 1
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def current_version(self):
|
def current_version(self):
|
||||||
version = Version.objects.get_for_object(self).select_related('revision').first()
|
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)
|
return "V{0} | R{1}".format(version.pk, version.revision.pk)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class Person(models.Model, RevisionMixin):
|
class Person(models.Model, RevisionMixin):
|
||||||
name = models.CharField(max_length=50)
|
name = models.CharField(max_length=50)
|
||||||
phone = models.CharField(max_length=15, blank=True, null=True)
|
phone = models.CharField(max_length=15, blank=True, null=True)
|
||||||
@@ -570,7 +576,7 @@ class Payment(models.Model):
|
|||||||
|
|
||||||
|
|
||||||
@reversion.register
|
@reversion.register
|
||||||
class RiskAssessment(models.Model):
|
class RiskAssessment(models.Model, RevisionMixin):
|
||||||
event = models.OneToOneField('Event', on_delete=models.CASCADE)
|
event = models.OneToOneField('Event', on_delete=models.CASCADE)
|
||||||
# General
|
# 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?")
|
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?")
|
||||||
|
|||||||
0
versioning/__init__.py
Normal file
0
versioning/__init__.py
Normal file
@@ -1,5 +1,5 @@
|
|||||||
<div class="pt-2">
|
<div class="pt-2">
|
||||||
<a href="{% url target id|default:object.pk %}" title="View Revision History">
|
<a href="{% url target id|default:object.pk %}" title="View Revision History">
|
||||||
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' }}
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user