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

Return no filter results if financial year dates are not set.

Browse Source 
This is a lot cleaner than trying to hack around whether or not the
FinancialYearFilter is part of the available filters. This way it will
show up if there are result for it and the dates are set, and it will
not if any of those conditions is not set.
This commit is contained in:
David Martin 2017-08-25 17:36:09 +10:00
parent 24fb6cefb9
commit c65c5009e4
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/documents/admin.py
View File

@ -41,13 +41,11 @@ class FinancialYearFilter(admin.SimpleListFilter):
def _fy_start(self, year):
"""Return date of the start of financial year for the given year."""
assert settings.FY_START
fy_start = "{}-{}".format(str(year), settings.FY_START)
return datetime.strptime(fy_start, "%Y-%m-%d").date()
def _fy_end(self, year):
"""Return date of the end of financial year for the given year."""
assert settings.FY_END
fy_end = "{}-{}".format(str(year), settings.FY_END)
return datetime.strptime(fy_end, "%Y-%m-%d").date()
@ -65,6 +63,9 @@ class FinancialYearFilter(admin.SimpleListFilter):
return (query, query)
def lookups(self, request, model_admin):
if not settings.FY_START or not settings.FY_END:
return None
r = []
for document in Document.objects.all():
r.append(self._determine_fy(document.created))
@ -72,7 +73,7 @@ class FinancialYearFilter(admin.SimpleListFilter):
return sorted(set(r), key=lambda x: x[0], reverse=True)
def queryset(self, request, queryset):
if not self.value():
if not self.value() or not settings.FY_START or not settings.FY_END:
return None
start, end = self.value().split("-")
@ -107,10 +108,8 @@ class DocumentAdmin(CommonAdmin):
search_fields = ("correspondent__name", "title", "content")
list_display = ("title", "created", "thumbnail", "correspondent", "tags_")
list_filter = ("tags", "correspondent")
if settings.FY_START and settings.FY_END:
list_filter += (FinancialYearFilter,)
list_filter += (MonthListFilter,)
list_filter = ("tags", "correspondent", FinancialYearFilter,
MonthListFilter)
ordering = ["-created", "correspondent"]