From bdd7f02fe2058fcc6d861f8ec47e9908a0e5556c Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 25 May 2017 13:09:52 +0100 Subject: [PATCH] Add EventAuthorisation to the activity feed --- RIGS/models.py | 7 +++++++ RIGS/templates/RIGS/object_button.html | 2 +- RIGS/versioning.py | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/RIGS/models.py b/RIGS/models.py index c1a33eb8..84b8ba39 100644 --- a/RIGS/models.py +++ b/RIGS/models.py @@ -521,6 +521,13 @@ class EventAuthorisation(models.Model, RevisionMixin): amount = models.DecimalField(max_digits=10, decimal_places=2, verbose_name="authorisation amount") sent_by = models.ForeignKey('RIGS.Profile') + def get_absolute_url(self): + return reverse_lazy('event_detail', kwargs={'pk': self.event.pk}) + + @property + def activity_feed_string(self): + return unicode("N%05d" % self.event.pk + ' (requested by ' + self.sent_by.initials + ')') + @python_2_unicode_compatible class Invoice(models.Model): diff --git a/RIGS/templates/RIGS/object_button.html b/RIGS/templates/RIGS/object_button.html index 92d4ed5a..be907795 100644 --- a/RIGS/templates/RIGS/object_button.html +++ b/RIGS/templates/RIGS/object_button.html @@ -1,4 +1,4 @@ {% load to_class_name from filters %} {# pass in variable "object" to this template #} -{% if object.is_rig == False %}Non-rig{% elif object.dry_hire %}Dry Hire{% elif object.is_rig %}Rig{%else%}{{object|to_class_name}}{% endif %} | '{{object.name}}' \ No newline at end of file +{% if object.is_rig == False %}Non-rig{% elif object.dry_hire %}Dry Hire{% elif object.is_rig %}Rig{%else%}{{object|to_class_name}}{% endif %} | '{{ object.activity_feed_string|default:object.name }}' \ No newline at end of file diff --git a/RIGS/versioning.py b/RIGS/versioning.py index 65d4328a..958b3a82 100644 --- a/RIGS/versioning.py +++ b/RIGS/versioning.py @@ -241,7 +241,7 @@ class ActivityTable(generic.ListView): paginate_by = 25 def get_queryset(self): - versions = get_versions_for_model([models.Event, models.Venue, models.Person, models.Organisation]) + versions = get_versions_for_model([models.Event, models.Venue, models.Person, models.Organisation, models.EventAuthorisation]) return versions def get_context_data(self, **kwargs): @@ -265,7 +265,7 @@ class ActivityFeed(generic.ListView): paginate_by = 25 def get_queryset(self): - versions = get_versions_for_model([models.Event, models.Venue, models.Person, models.Organisation]) + versions = get_versions_for_model([models.Event, models.Venue, models.Person, models.Organisation, models.EventAuthorisation]) return versions def get_context_data(self, **kwargs):