mirror of
https://github.com/paperless-ngx/paperless-ngx.git
synced 2025-08-14 00:26:21 +00:00
New logging appears to work
This commit is contained in:
@@ -3,7 +3,7 @@ from django.contrib.auth.models import User, Group
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.templatetags.static import static
|
||||
|
||||
from .models import Sender, Tag, Document
|
||||
from .models import Sender, Tag, Document, Log
|
||||
|
||||
|
||||
class MonthListFilter(admin.SimpleListFilter):
|
||||
@@ -57,7 +57,7 @@ class DocumentAdmin(admin.ModelAdmin):
|
||||
r = ""
|
||||
for tag in obj.tags.all():
|
||||
colour = tag.get_colour_display()
|
||||
r += html_tag(
|
||||
r += self._html_tag(
|
||||
"a",
|
||||
tag.slug,
|
||||
**{
|
||||
@@ -73,9 +73,9 @@ class DocumentAdmin(admin.ModelAdmin):
|
||||
tags_.allow_tags = True
|
||||
|
||||
def document(self, obj):
|
||||
return html_tag(
|
||||
return self._html_tag(
|
||||
"a",
|
||||
html_tag(
|
||||
self._html_tag(
|
||||
"img",
|
||||
src=static("documents/img/{}.png".format(obj.file_type)),
|
||||
width=22,
|
||||
@@ -87,23 +87,32 @@ class DocumentAdmin(admin.ModelAdmin):
|
||||
)
|
||||
document.allow_tags = True
|
||||
|
||||
@staticmethod
|
||||
def _html_tag(kind, inside=None, **kwargs):
|
||||
|
||||
attributes = []
|
||||
for lft, rgt in kwargs.items():
|
||||
attributes.append('{}="{}"'.format(lft, rgt))
|
||||
|
||||
if inside is not None:
|
||||
return "<{kind} {attributes}>{inside}</{kind}>".format(
|
||||
kind=kind, attributes=" ".join(attributes), inside=inside)
|
||||
|
||||
return "<{} {}/>".format(kind, " ".join(attributes))
|
||||
|
||||
|
||||
class LogAdmin(admin.ModelAdmin):
|
||||
|
||||
list_display = ("message", "level", "component")
|
||||
list_filter = ("level", "component",)
|
||||
|
||||
|
||||
admin.site.register(Sender)
|
||||
admin.site.register(Tag, TagAdmin)
|
||||
admin.site.register(Document, DocumentAdmin)
|
||||
admin.site.register(Log, LogAdmin)
|
||||
|
||||
|
||||
# Unless we implement multi-user, these default registrations don't make sense.
|
||||
admin.site.unregister(Group)
|
||||
admin.site.unregister(User)
|
||||
|
||||
|
||||
def html_tag(kind, inside=None, **kwargs):
|
||||
|
||||
attributes = []
|
||||
for lft, rgt in kwargs.items():
|
||||
attributes.append('{}="{}"'.format(lft, rgt))
|
||||
|
||||
if inside is not None:
|
||||
return "<{kind} {attributes}>{inside}</{kind}>".format(
|
||||
kind=kind, attributes=" ".join(attributes), inside=inside)
|
||||
|
||||
return "<{} {}/>".format(kind, " ".join(attributes))
|
||||
|
Reference in New Issue
Block a user