Merge branch 'master' into wizard_form

ippisite/ippidb/admin.py

@@ -70,6 +70,9 @@ class TextActivityDescription(admin.ModelAdmin):
 @admin.register(Ppi)
 class PpiModelAdmin(admin.ModelAdmin):
     filter_horizontal = ('diseases',)
+    list_display = ('pdb_id', 'name', 'symmetry', 'family')
+    list_filter = ('diseases',)
+    search_fields = ('pdb_id', 'name', 'symmetry', 'family__name', 'diseases__name')
 
 
 @admin.register(ProteinDomainComplex)

ippisite/ippidb/models.py

@@ -1205,6 +1205,9 @@ class RefCompoundBiblio(models.Model):
     class Meta:
         unique_together = (('compound', 'bibliography'),)
 
+    def __str__(self):
+        return 'Ref. {} on {}'.format(self.bibliography, self.compound)
+
 
 class DrugBankCompound(models.Model):
     """