Merge branch 'sbrunner-dql'

Pipfile

@@ -35,6 +35,7 @@ pytest-sugar = "*"
 pytest-env = "*"
 pytest-xdist = "*"
 psycopg2 = "*"
+djangoql = "*"
 
 [dev-packages]
 ipython = "*"

requirements.txt

@@ -4,77 +4,67 @@ apipkg==1.5
 atomicwrites==1.2.1
 attrs==18.2.0
 babel==2.6.0
-backcall==0.1.0
-certifi==2018.10.15
+certifi==2018.11.29
 chardet==3.0.4
-coverage==4.5.1
+coverage==4.5.2
 coveralls==1.5.1
 dateparser==0.7.0
-decorator==4.3.0
 django-cors-headers==2.4.0
 django-crispy-forms==1.7.2
-django-extensions==2.1.3
-django-filter==2.0.0
-django==2.0.9
-djangorestframework==3.9.0
+django-extensions==2.1.4
+django-filter==2.1.0
+django==2.0.10
+djangoql==0.12.3
+djangorestframework==3.9.1
 docopt==0.6.2
 docutils==0.14
 execnet==1.5.0
 factory-boy==2.11.1
-faker==0.9.2
+faker==1.0.2
 filelock==3.0.10
 filemagic==1.6
 fuzzywuzzy[speedup]==0.15.0
 gunicorn==19.9.0
-idna==2.7
+idna==2.8
 imagesize==1.1.0
 inotify-simple==1.1.8
-ipython-genutils==0.2.0
-ipython==7.1.1
-jedi==0.13.1
 jinja2==2.10
 langdetect==1.0.7
-markupsafe==1.0
-more-itertools==4.3.0
-packaging==18.0
-parso==0.3.1
+markupsafe==1.1.0
+more-itertools==5.0.0
+packaging==19.0
 pdftotext==2.1.1
-pexpect==4.6.0 
-pickleshare==0.7.5
-pillow==5.3.0
-pluggy==0.8.0
-psycopg2==2.7.6.1
-prompt-toolkit==2.0.7
-ptyprocess==0.6.0
+pillow==5.4.1
+pluggy==0.8.1
+ply==3.11
+psycopg2==2.7.7
 py==1.7.0
 pycodestyle==2.4.0
-pygments==2.2.0
+pygments==2.3.1
 pyocr==0.5.3
-pyparsing==2.3.0
-pytest-cov==2.6.0
-pytest-django==3.4.3
+pyparsing==2.3.1
+pytest-cov==2.6.1
+pytest-django==3.4.5
 pytest-env==0.6.2
-pytest-forked==0.2
-pytest-sugar==0.9.1
-pytest-xdist==1.24.0
-pytest==3.9.3
+pytest-forked==1.0.1
+pytest-sugar==0.9.2
+pytest-xdist==1.26.0
+pytest==4.1.1
 python-dateutil==2.7.5
-python-dotenv==0.9.1
-python-gnupg==0.4.3
-python-levenshtein==0.12.0 ; extra == 'speedup'
-pytz==2018.7
-regex==2018.11.2
-requests==2.20.0
-six==1.11.0
+python-dotenv==0.10.1
+python-gnupg==0.4.4
+python-levenshtein==0.12.0
+pytz==2018.9
+regex==2019.1.24
+requests==2.21.0
+six==1.12.0
 snowballstemmer==1.2.1
-sphinx==1.8.1
+sphinx==1.8.3
 sphinxcontrib-websupport==1.1.0
 termcolor==1.1.0
 text-unidecode==1.2
 toml==0.10.0
-tox==3.5.3
-traitlets==4.3.2
+tox==3.7.0
 tzlocal==1.5.1
 urllib3==1.24.1
-virtualenv==16.1.0
-wcwidth==0.1.7
+virtualenv==16.3.0

src/documents/admin.py

@@ -11,6 +11,7 @@
 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,
@@ -165,7 +166,7 @@ def document_count(self, obj):
     document_count.admin_order_field = "document_count"
 
 
-class DocumentAdmin(CommonAdmin):
+class DocumentAdmin(DjangoQLSearchMixin, CommonAdmin):
 
     class Media:
         css = {

src/paperless/settings.py

@@ -83,6 +83,7 @@ def __get_boolean(key, default="NO"):
     "rest_framework",
     "crispy_forms",
     "django_filters",
+    "djangoql",
 
 ]
 

src/tox.ini

@@ -17,6 +17,5 @@ deps=pycodestyle
 
 [testenv:doc]
 deps =
-  -r{toxinidir}/../requirements.txt
-  sphinx
+  -r {toxinidir}/../requirements.txt
 commands=sphinx-build -b html ../docs ../docs/_build -W