Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jonas Winkler
2018-07-10 15:46:46 +02:00
18 changed files with 618 additions and 418 deletions

View File

@@ -106,17 +106,24 @@ class CommonAdmin(admin.ModelAdmin):
class CorrespondentAdmin(CommonAdmin):
list_display = ("name", "match", "matching_algorithm")
list_display = ("name", "match", "matching_algorithm", "document_count")
list_filter = ("matching_algorithm",)
list_editable = ("match", "matching_algorithm")
def document_count(self, obj):
return obj.documents.count()
class TagAdmin(CommonAdmin):
list_display = ("name", "colour", "match", "matching_algorithm")
list_display = ("name", "colour", "match", "matching_algorithm",
"document_count")
list_filter = ("colour", "matching_algorithm")
list_editable = ("colour", "match", "matching_algorithm")
def document_count(self, obj):
return obj.documents.count()
class DocumentAdmin(CommonAdmin):