SciPost Code Repository

Skip to content
Snippets Groups Projects
Commit 9ee7e04a authored by Jean-Sébastien Caux's avatar Jean-Sébastien Caux
Browse files

Merge branch 'hotfix_JSC_20170611_partnersemail'

parents cbdee09a 49807644
No related branches found
No related tags found
No related merge requests found
from django.contrib import admin from django.contrib import admin
from .models import Contact, Partner, Consortium, ProspectivePartner, MembershipAgreement,\ from .models import Contact, Partner, PartnerEvent, Consortium,\
ProspectiveContact ProspectivePartner, ProspectiveContact, ProspectivePartnerEvent,\
MembershipAgreement
class ProspectiveContactInline(admin.TabularInline): class ProspectiveContactInline(admin.TabularInline):
model = ProspectiveContact model = ProspectiveContact
extra = 0 extra = 0
class ProspectivePartnerEventInline(admin.TabularInline):
class PartnerAdmin(admin.ModelAdmin): model = ProspectivePartnerEvent
search_fields = ('institution', )
class ProspectivePartnerAdmin(admin.ModelAdmin): class ProspectivePartnerAdmin(admin.ModelAdmin):
inlines = (ProspectiveContactInline,) inlines = (ProspectiveContactInline, ProspectivePartnerEventInline,)
list_display = ('institution_name', 'date_received', 'status') list_display = ('institution_name', 'date_received', 'status')
list_filter = ('kind', 'status') list_filter = ('kind', 'status')
class PartnerAdmin(admin.ModelAdmin):
search_fields = ('institution', )
admin.site.register(Partner, PartnerAdmin) admin.site.register(Partner, PartnerAdmin)
admin.site.register(Contact) admin.site.register(Contact)
admin.site.register(Consortium) admin.site.register(Consortium)
......
...@@ -83,7 +83,7 @@ class ProspectivePartnerEvent(models.Model): ...@@ -83,7 +83,7 @@ class ProspectivePartnerEvent(models.Model):
blank=True, null=True) blank=True, null=True)
def __str__(self): def __str__(self):
return '%s: %s' % (str(self.prospective_partner), self.get_event_display()) return '%s: %s' % (str(self.prospartner), self.get_event_display())
########################### ###########################
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment