diff --git a/cbreader/settings/base.py b/cbreader/settings/base.py index 6f6cad1..c45de04 100644 --- a/cbreader/settings/base.py +++ b/cbreader/settings/base.py @@ -38,6 +38,7 @@ INSTALLED_APPS = ( 'bootstrap4', "comic", "comic_auth", + 'django_extensions', ) MIDDLEWARE = [ diff --git a/comic/admin.py b/comic/admin.py index 8f58171..5c2d7e9 100644 --- a/comic/admin.py +++ b/comic/admin.py @@ -1,25 +1,51 @@ +# -*- coding: utf-8 -*- from django.contrib import admin -from comic.models import ComicBook, ComicPage, ComicStatus, Directory - - -@admin.register(ComicBook) -class ComicBookAdmin(admin.ModelAdmin): - list_display = ["file_name", "date_added"] - search_fields = ["file_name"] - - -@admin.register(ComicPage) -class ComicPageAdmin(admin.ModelAdmin): - list_display = ("Comic", "index", "page_file_name", "content_type") - list_filter = ["Comic"] - - -@admin.register(ComicStatus) -class ComicStatusAdmin(admin.ModelAdmin): - list_display = ["user", "comic", "last_read_page", "unread"] +from .models import Directory, ComicBook, ComicPage, ComicStatus, UserMisc @admin.register(Directory) class DirectoryAdmin(admin.ModelAdmin): - pass + list_display = ('id', 'name', 'parent', 'selector') + raw_id_fields = ('parent',) + search_fields = ('name',) + + +@admin.register(ComicBook) +class ComicBookAdmin(admin.ModelAdmin): + list_display = ( + 'id', + 'file_name', + 'date_added', + 'directory', + 'selector', + 'version', + ) + list_filter = ('date_added',) + raw_id_fields = ('directory',) + + +@admin.register(ComicPage) +class ComicPageAdmin(admin.ModelAdmin): + list_display = ('id', 'Comic', 'index', 'page_file_name', 'content_type') + raw_id_fields = ('Comic',) + + +@admin.register(ComicStatus) +class ComicStatusAdmin(admin.ModelAdmin): + list_display = ( + 'id', + 'user', + 'comic', + 'last_read_page', + 'unread', + 'finished', + ) + list_filter = ('unread', 'finished') + raw_id_fields = ('user', 'comic') + + +@admin.register(UserMisc) +class UserMiscAdmin(admin.ModelAdmin): + list_display = ('id', 'user', 'feed_id') + list_filter = ('user',) \ No newline at end of file diff --git a/poetry.lock b/poetry.lock index 88d1fd4..9ad9d85 100644 --- a/poetry.lock +++ b/poetry.lock @@ -111,6 +111,17 @@ django = ">=2.2,<4.0" [package.extras] docs = ["sphinx (>=2.4,<3.0)", "sphinx_rtd_theme (>=0.4.3,<0.5.0)", "m2r2 (>=0.2.5,<0.3.0)"] +[[package]] +name = "django-extensions" +version = "3.1.3" +description = "Extensions for Django" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +Django = ">=2.2" + [[package]] name = "django-recaptcha2" version = "1.4.1" @@ -403,7 +414,7 @@ dev = ["pytest (>=4.6.2)", "black (>=19.3b0)"] [metadata] lock-version = "1.1" python-versions = "^3.8" -content-hash = "57403dfb9e86b56159f8eb15a1c438555eb5d30fff311def4ab42f9b15608c66" +content-hash = "4b1fa38b242472a4006be4f77c969c122881924594ff66f0f74e7a7eded4f362" [metadata.files] asgiref = [ @@ -497,6 +508,10 @@ django-bootstrap4 = [ {file = "django-bootstrap4-2.3.1.tar.gz", hash = "sha256:2c199020ac38866cdf8d1c5561ce7468116b9685b455a29843c0225ef8568879"}, {file = "django_bootstrap4-2.3.1-py3-none-any.whl", hash = "sha256:b68f073b647b20ec7894a252a0ca4e06b7b8dafdbad995cb0cdc783d0bb4629d"}, ] +django-extensions = [ + {file = "django-extensions-3.1.3.tar.gz", hash = "sha256:5f0fea7bf131ca303090352577a9e7f8bfbf5489bd9d9c8aea9401db28db34a0"}, + {file = "django_extensions-3.1.3-py3-none-any.whl", hash = "sha256:50de8977794a66a91575dd40f87d5053608f679561731845edbd325ceeb387e3"}, +] django-recaptcha2 = [ {file = "django-recaptcha2-1.4.1.tar.gz", hash = "sha256:c0b43851b05c6bf6ebb5ecc890c13ccedacd9bb33d64b4291c74dd6fcbc89366"}, {file = "django_recaptcha2-1.4.1-py3-none-any.whl", hash = "sha256:9ea90db0cec502741be1066c09ec1b8e02a73162a319a042e78e67c4605087af"}, diff --git a/pyproject.toml b/pyproject.toml index 1e7d614..0572fb0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,6 +23,7 @@ mysqlclient = "^2.0.1" psycopg2 = "^2.8.6" rarfile = "^4.0" coverage = "^5.5" +django-extensions = "^3.1.3" [tool.poetry.dev-dependencies] mypy = "^0.812"