Merge branch 'hotfix_JSC_20170611_partnersemail'

partners/admin.py

 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)

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())
 
 
 ###########################