Merge branch 'master' into dev

This commit is contained in:
Jonas Winkler 2019-05-21 13:06:16 +02:00
commit 32f3876590
35 changed files with 587 additions and 297 deletions

View file

@ -11,6 +11,7 @@ from django.urls import reverse
from django.utils.html import format_html, format_html_join
from django.utils.http import urlquote
from django.utils.safestring import mark_safe
from djangoql.admin import DjangoQLSearchMixin
from documents.actions import (
add_tag_to_selected,
@ -186,7 +187,7 @@ class DocumentTypeAdmin(CommonAdmin):
document_count.admin_order_field = "document_count"
class DocumentAdmin(CommonAdmin):
class DocumentAdmin(DjangoQLSearchMixin, CommonAdmin):
class Media:
css = {