From 49807644fc1b8ee23d61c9d52d9646b39929fb84 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Sun, 11 Jun 2017 09:40:21 +0200
Subject: [PATCH] Improve admin for ProspectivePartners
---
partners/admin.py | 18 ++++++++++--------
partners/models.py | 2 +-
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/partners/admin.py b/partners/admin.py
index d2277fbda..50290d597 100644
--- a/partners/admin.py
+++ b/partners/admin.py
@@ -1,24 +1,26 @@
from django.contrib import admin
-from .models import Contact, Partner, Consortium, ProspectivePartner, MembershipAgreement,\
- ProspectiveContact
-
+from .models import Contact, Partner, PartnerEvent, Consortium,\
+ ProspectivePartner, ProspectiveContact, ProspectivePartnerEvent,\
+ MembershipAgreement
class ProspectiveContactInline(admin.TabularInline):
model = ProspectiveContact
extra = 0
-
-class PartnerAdmin(admin.ModelAdmin):
- search_fields = ('institution', )
-
+class ProspectivePartnerEventInline(admin.TabularInline):
+ model = ProspectivePartnerEvent
class ProspectivePartnerAdmin(admin.ModelAdmin):
- inlines = (ProspectiveContactInline,)
+ inlines = (ProspectiveContactInline, ProspectivePartnerEventInline,)
list_display = ('institution_name', 'date_received', 'status')
list_filter = ('kind', 'status')
+class PartnerAdmin(admin.ModelAdmin):
+ search_fields = ('institution', )
+
+
admin.site.register(Partner, PartnerAdmin)
admin.site.register(Contact)
admin.site.register(Consortium)
diff --git a/partners/models.py b/partners/models.py
index 075826f7a..fd757800d 100644
--- a/partners/models.py
+++ b/partners/models.py
@@ -83,7 +83,7 @@ class ProspectivePartnerEvent(models.Model):
blank=True, null=True)
def __str__(self):
- return '%s: %s' % (str(self.prospective_partner), self.get_event_display())
+ return '%s: %s' % (str(self.prospartner), self.get_event_display())
###########################
--
GitLab