mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-18 14:02:15 +00:00
One of these days I'll remember to test BEFORE pushing...
This commit is contained in:
@@ -473,7 +473,7 @@ class Event(models.Model, RevisionMixin):
|
||||
return reverse_lazy('event_detail', kwargs={'pk': self.pk})
|
||||
|
||||
def __str__(self):
|
||||
return self.display_id + ": " + self.name
|
||||
return "{}: {}".format(self.display_id, self.name)
|
||||
|
||||
def clean(self):
|
||||
errdict = {}
|
||||
|
||||
@@ -20,7 +20,7 @@ from RIGS import models, forms
|
||||
from assets import models as asset_models
|
||||
from functools import reduce
|
||||
|
||||
from PyRIGS.views import GenericListView,GenericDetailView
|
||||
from PyRIGS.views import GenericListView, GenericDetailView
|
||||
|
||||
|
||||
class PersonList(GenericListView):
|
||||
@@ -43,8 +43,8 @@ class PersonDetail(GenericDetailView):
|
||||
context['history_link'] = 'person_history'
|
||||
context['detail_link'] = 'person_detail'
|
||||
context['update_link'] = 'person_update'
|
||||
context['associated'] ='partials/associated_organisations.html'
|
||||
context['associated2'] ='partials/associated_events.html'
|
||||
context['associated'] = 'partials/associated_organisations.html'
|
||||
context['associated2'] = 'partials/associated_events.html'
|
||||
return context
|
||||
|
||||
|
||||
@@ -95,6 +95,7 @@ class OrganisationList(GenericListView):
|
||||
context['union_account'] = True
|
||||
return context
|
||||
|
||||
|
||||
class OrganisationDetail(GenericDetailView):
|
||||
model = models.Organisation
|
||||
|
||||
@@ -103,10 +104,11 @@ class OrganisationDetail(GenericDetailView):
|
||||
context['history_link'] = 'organisation_history'
|
||||
context['detail_link'] = 'organisation_detail'
|
||||
context['update_link'] = 'organisation_update'
|
||||
context['associated'] ='partials/associated_people.html'
|
||||
context['associated2'] ='partials/associated_events.html'
|
||||
context['associated'] = 'partials/associated_people.html'
|
||||
context['associated2'] = 'partials/associated_events.html'
|
||||
return context
|
||||
|
||||
|
||||
class OrganisationCreate(generic.CreateView):
|
||||
template_name = 'organisation_form.html'
|
||||
model = models.Organisation
|
||||
|
||||
Reference in New Issue
Block a user