paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-17 10:13:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix the correspondent filters #423

Browse Source
This commit is contained in:
Daniel Quinn 2018-11-03 11:06:55 +00:00
parent 33abec0663
commit eca6250c1b
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/changelog.rst
View File

@ -6,6 +6,9 @@ Changelog
* Allow an infinite number of logs to be deleted. Thanks to `Ulli`_ for noting * Allow an infinite number of logs to be deleted. Thanks to `Ulli`_ for noting
the problem in `#433`_. the problem in `#433`_.
* Fix the ``RecentCorrespondentsFilter`` correspondents filter that was added
in 2.4 to play nice with the defaults. Thanks to `tsia`_ and `Sblop`_ who
pointed this out. `#423`_.
2.5.0 2.5.0
@ -579,6 +582,8 @@ bulk of the work on this big change.
.. _Andrew Peng: https://github.com/pengc99 .. _Andrew Peng: https://github.com/pengc99
.. _euri10: https://github.com/euri10 .. _euri10: https://github.com/euri10
.. _Ulli: https://github.com/Ulli2k .. _Ulli: https://github.com/Ulli2k
.. _tsia: https://github.com/tsia
.. _Sblop: https://github.com/Sblop
.. _#20: https://github.com/danielquinn/paperless/issues/20 .. _#20: https://github.com/danielquinn/paperless/issues/20
.. _#44: https://github.com/danielquinn/paperless/issues/44 .. _#44: https://github.com/danielquinn/paperless/issues/44
@ -673,6 +678,7 @@ bulk of the work on this big change.
.. _#412: https://github.com/danielquinn/paperless/issues/412 .. _#412: https://github.com/danielquinn/paperless/issues/412
.. _#413: https://github.com/danielquinn/paperless/pull/413 .. _#413: https://github.com/danielquinn/paperless/pull/413
.. _#414: https://github.com/danielquinn/paperless/issues/414 .. _#414: https://github.com/danielquinn/paperless/issues/414
.. _#423: https://github.com/danielquinn/paperless/issues/423
.. _#433: https://github.com/danielquinn/paperless/issues/433 .. _#433: https://github.com/danielquinn/paperless/issues/433
.. _pipenv: https://docs.pipenv.org/ .. _pipenv: https://docs.pipenv.org/

20
src/documents/admin.py
View File

@ -88,25 +88,24 @@ class FinancialYearFilter(admin.SimpleListFilter):
class RecentCorrespondentFilter(admin.RelatedFieldListFilter): class RecentCorrespondentFilter(admin.RelatedFieldListFilter):
"""
def __init__(self, *args, **kwargs): If PAPERLESS_RECENT_CORRESPONDENT_YEARS is set, we limit the available
super().__init__(*args, **kwargs) correspondents to documents sent our way over the past ``n`` years.
self.title = "correspondent (recent)" """
def field_choices(self, field, request, model_admin): def field_choices(self, field, request, model_admin):
years = settings.PAPERLESS_RECENT_CORRESPONDENT_YEARS years = settings.PAPERLESS_RECENT_CORRESPONDENT_YEARS
days = 365 * years correspondents = Correspondent.objects.all()
lookups = []
if years and years > 0: if years and years > 0:
correspondents = Correspondent.objects.filter( self.title = "Correspondent (Recent)"
days = 365 * years
correspondents = correspondents.filter(
documents__created__gte=datetime.now() - timedelta(days=days) documents__created__gte=datetime.now() - timedelta(days=days)
).distinct() ).distinct()
for c in correspondents:
lookups.append((c.id, c.name))
return lookups return [(c.id, c.name) for c in correspondents]
class CommonAdmin(admin.ModelAdmin): class CommonAdmin(admin.ModelAdmin):
@ -177,7 +176,6 @@ class DocumentAdmin(CommonAdmin):
list_filter = ( list_filter = (
"tags", "tags",
("correspondent", RecentCorrespondentFilter), ("correspondent", RecentCorrespondentFilter),
"correspondent",
FinancialYearFilter FinancialYearFilter
) )