mirror of
https://github.com/daniviga/django-ram.git
synced 2025-12-26 07:18:32 +01:00
Add support for magazines, backend only (#53)
* Initial work to support magazines * Change editor default height to 300px from 500px * Stabilize the magazine repository app * Switch from stacked to tabular inlines for magazines * Update submodules
This commit is contained in:
GitHub
Submodule arduino/CommandStation-EX updated: 3b15491608...313d2cd3e0
Submodule arduino/WebThrottle-EX updated: eb43d7906f...eeec7d4af6
Submodule arduino/arduino-cli updated: fa6eafcbbe...08ff7e2b76
Submodule arduino/dcc-ex.github.io updated: a0f886b69f...190d3adfa1
@@ -8,7 +8,11 @@ from adminsortable2.admin import SortableAdminBase, SortableInlineAdminMixin
|
||||
from ram.admin import publish, unpublish
|
||||
from ram.utils import generate_csv
|
||||
from portal.utils import get_site_conf
|
||||
from repository.models import BookDocument, CatalogDocument
|
||||
from repository.models import (
|
||||
BookDocument,
|
||||
CatalogDocument,
|
||||
MagazineIssueDocument
|
||||
)
|
||||
from bookshelf.models import (
|
||||
BaseBookProperty,
|
||||
BaseBookImage,
|
||||
@@ -16,6 +20,8 @@ from bookshelf.models import (
|
||||
Author,
|
||||
Publisher,
|
||||
Catalog,
|
||||
Magazine,
|
||||
MagazineIssue,
|
||||
)
|
||||
|
||||
|
||||
@@ -48,6 +54,10 @@ class CatalogDocInline(BookDocInline):
|
||||
model = CatalogDocument
|
||||
|
||||
|
||||
class MagazineIssueDocInline(BookDocInline):
|
||||
model = MagazineIssueDocument
|
||||
|
||||
|
||||
@admin.register(Book)
|
||||
class BookAdmin(SortableAdminBase, admin.ModelAdmin):
|
||||
inlines = (
|
||||
@@ -66,7 +76,7 @@ class BookAdmin(SortableAdminBase, admin.ModelAdmin):
|
||||
autocomplete_fields = ("authors", "publisher", "shop")
|
||||
readonly_fields = ("invoices", "creation_time", "updated_time")
|
||||
search_fields = ("title", "publisher__name", "authors__last_name")
|
||||
list_filter = ("publisher__name", "authors")
|
||||
list_filter = ("publisher__name", "authors", "published")
|
||||
|
||||
fieldsets = (
|
||||
(
|
||||
@@ -229,7 +239,12 @@ class CatalogAdmin(SortableAdminBase, admin.ModelAdmin):
|
||||
autocomplete_fields = ("manufacturer",)
|
||||
readonly_fields = ("invoices", "creation_time", "updated_time")
|
||||
search_fields = ("manufacturer__name", "years", "scales__scale")
|
||||
list_filter = ("manufacturer__name", "publication_year", "scales__scale")
|
||||
list_filter = (
|
||||
"manufacturer__name",
|
||||
"publication_year",
|
||||
"scales__scale",
|
||||
"published",
|
||||
)
|
||||
|
||||
fieldsets = (
|
||||
(
|
||||
@@ -346,3 +361,142 @@ class CatalogAdmin(SortableAdminBase, admin.ModelAdmin):
|
||||
|
||||
download_csv.short_description = "Download selected items as CSV"
|
||||
actions = [publish, unpublish, download_csv]
|
||||
|
||||
|
||||
@admin.register(MagazineIssue)
|
||||
class MagazineIssueAdmin(SortableAdminBase, admin.ModelAdmin):
|
||||
inlines = (
|
||||
BookPropertyInline,
|
||||
BookImageInline,
|
||||
MagazineIssueDocInline,
|
||||
)
|
||||
list_display = (
|
||||
"__str__",
|
||||
"issue_number",
|
||||
"published",
|
||||
)
|
||||
autocomplete_fields = ("shop",)
|
||||
readonly_fields = ("magazine", "creation_time", "updated_time")
|
||||
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
fieldsets = (
|
||||
(
|
||||
None,
|
||||
{
|
||||
"fields": (
|
||||
"published",
|
||||
"magazine",
|
||||
"issue_number",
|
||||
"publication_year",
|
||||
"publication_month",
|
||||
"ISBN",
|
||||
"language",
|
||||
"number_of_pages",
|
||||
"description",
|
||||
"tags",
|
||||
)
|
||||
},
|
||||
),
|
||||
(
|
||||
"Purchase data",
|
||||
{
|
||||
"classes": ("collapse",),
|
||||
"fields": (
|
||||
"shop",
|
||||
"purchase_date",
|
||||
"price",
|
||||
),
|
||||
},
|
||||
),
|
||||
(
|
||||
"Notes",
|
||||
{"classes": ("collapse",), "fields": ("notes",)},
|
||||
),
|
||||
(
|
||||
"Audit",
|
||||
{
|
||||
"classes": ("collapse",),
|
||||
"fields": (
|
||||
"creation_time",
|
||||
"updated_time",
|
||||
),
|
||||
},
|
||||
),
|
||||
)
|
||||
actions = [publish, unpublish]
|
||||
|
||||
|
||||
class MagazineIssueInline(admin.TabularInline):
|
||||
model = MagazineIssue
|
||||
min_num = 0
|
||||
extra = 0
|
||||
autocomplete_fields = ("shop",)
|
||||
show_change_link = True
|
||||
fields = (
|
||||
"preview",
|
||||
"published",
|
||||
"issue_number",
|
||||
"publication_year",
|
||||
"publication_month",
|
||||
"number_of_pages",
|
||||
"language",
|
||||
)
|
||||
readonly_fields = ("preview",)
|
||||
|
||||
class Media:
|
||||
js = ('admin/js/magazine_issue_defaults.js',)
|
||||
|
||||
|
||||
@admin.register(Magazine)
|
||||
class MagazineAdmin(SortableAdminBase, admin.ModelAdmin):
|
||||
inlines = (
|
||||
MagazineIssueInline,
|
||||
)
|
||||
|
||||
list_display = (
|
||||
"__str__",
|
||||
"publisher",
|
||||
"published",
|
||||
)
|
||||
autocomplete_fields = ("publisher",)
|
||||
readonly_fields = ("creation_time", "updated_time")
|
||||
search_fields = ("name", "publisher__name")
|
||||
list_filter = ("publisher__name", "published")
|
||||
|
||||
fieldsets = (
|
||||
(
|
||||
None,
|
||||
{
|
||||
"fields": (
|
||||
"published",
|
||||
"name",
|
||||
"publisher",
|
||||
"ISBN",
|
||||
"language",
|
||||
"description",
|
||||
"image",
|
||||
"tags",
|
||||
)
|
||||
},
|
||||
),
|
||||
(
|
||||
"Notes",
|
||||
{"classes": ("collapse",), "fields": ("notes",)},
|
||||
),
|
||||
(
|
||||
"Audit",
|
||||
{
|
||||
"classes": ("collapse",),
|
||||
"fields": (
|
||||
"creation_time",
|
||||
"updated_time",
|
||||
),
|
||||
},
|
||||
),
|
||||
)
|
||||
actions = [publish, unpublish]
|
||||
|
||||
224
ram/bookshelf/migrations/0025_magazine_magazineissue.py
Normal file
224
ram/bookshelf/migrations/0025_magazine_magazineissue.py
Normal file
@@ -0,0 +1,224 @@
|
||||
# Generated by Django 6.0 on 2025-12-08 17:47
|
||||
|
||||
import bookshelf.models
|
||||
import django.db.models.deletion
|
||||
import ram.utils
|
||||
import tinymce.models
|
||||
import uuid
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("bookshelf", "0024_alter_basebook_language"),
|
||||
("metadata", "0025_alter_company_options_alter_manufacturer_options_and_more"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name="Magazine",
|
||||
fields=[
|
||||
(
|
||||
"uuid",
|
||||
models.UUIDField(
|
||||
default=uuid.uuid4,
|
||||
editable=False,
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
),
|
||||
),
|
||||
("description", tinymce.models.HTMLField(blank=True)),
|
||||
("notes", tinymce.models.HTMLField(blank=True)),
|
||||
("creation_time", models.DateTimeField(auto_now_add=True)),
|
||||
("updated_time", models.DateTimeField(auto_now=True)),
|
||||
("published", models.BooleanField(default=True)),
|
||||
("name", models.CharField(max_length=200)),
|
||||
("ISBN", models.CharField(blank=True, max_length=17)),
|
||||
(
|
||||
"image",
|
||||
models.ImageField(
|
||||
blank=True,
|
||||
storage=ram.utils.DeduplicatedStorage,
|
||||
upload_to=bookshelf.models.book_image_upload,
|
||||
),
|
||||
),
|
||||
(
|
||||
"language",
|
||||
models.CharField(
|
||||
choices=[
|
||||
("af", "Afrikaans"),
|
||||
("ar", "Arabic"),
|
||||
("ar-dz", "Algerian Arabic"),
|
||||
("ast", "Asturian"),
|
||||
("az", "Azerbaijani"),
|
||||
("bg", "Bulgarian"),
|
||||
("be", "Belarusian"),
|
||||
("bn", "Bengali"),
|
||||
("br", "Breton"),
|
||||
("bs", "Bosnian"),
|
||||
("ca", "Catalan"),
|
||||
("ckb", "Central Kurdish (Sorani)"),
|
||||
("cs", "Czech"),
|
||||
("cy", "Welsh"),
|
||||
("da", "Danish"),
|
||||
("de", "German"),
|
||||
("dsb", "Lower Sorbian"),
|
||||
("el", "Greek"),
|
||||
("en", "English"),
|
||||
("en-au", "Australian English"),
|
||||
("en-gb", "British English"),
|
||||
("eo", "Esperanto"),
|
||||
("es", "Spanish"),
|
||||
("es-ar", "Argentinian Spanish"),
|
||||
("es-co", "Colombian Spanish"),
|
||||
("es-mx", "Mexican Spanish"),
|
||||
("es-ni", "Nicaraguan Spanish"),
|
||||
("es-ve", "Venezuelan Spanish"),
|
||||
("et", "Estonian"),
|
||||
("eu", "Basque"),
|
||||
("fa", "Persian"),
|
||||
("fi", "Finnish"),
|
||||
("fr", "French"),
|
||||
("fy", "Frisian"),
|
||||
("ga", "Irish"),
|
||||
("gd", "Scottish Gaelic"),
|
||||
("gl", "Galician"),
|
||||
("he", "Hebrew"),
|
||||
("hi", "Hindi"),
|
||||
("hr", "Croatian"),
|
||||
("hsb", "Upper Sorbian"),
|
||||
("ht", "Haitian Creole"),
|
||||
("hu", "Hungarian"),
|
||||
("hy", "Armenian"),
|
||||
("ia", "Interlingua"),
|
||||
("id", "Indonesian"),
|
||||
("ig", "Igbo"),
|
||||
("io", "Ido"),
|
||||
("is", "Icelandic"),
|
||||
("it", "Italian"),
|
||||
("ja", "Japanese"),
|
||||
("ka", "Georgian"),
|
||||
("kab", "Kabyle"),
|
||||
("kk", "Kazakh"),
|
||||
("km", "Khmer"),
|
||||
("kn", "Kannada"),
|
||||
("ko", "Korean"),
|
||||
("ky", "Kyrgyz"),
|
||||
("lb", "Luxembourgish"),
|
||||
("lt", "Lithuanian"),
|
||||
("lv", "Latvian"),
|
||||
("mk", "Macedonian"),
|
||||
("ml", "Malayalam"),
|
||||
("mn", "Mongolian"),
|
||||
("mr", "Marathi"),
|
||||
("ms", "Malay"),
|
||||
("my", "Burmese"),
|
||||
("nb", "Norwegian Bokmål"),
|
||||
("ne", "Nepali"),
|
||||
("nl", "Dutch"),
|
||||
("nn", "Norwegian Nynorsk"),
|
||||
("os", "Ossetic"),
|
||||
("pa", "Punjabi"),
|
||||
("pl", "Polish"),
|
||||
("pt", "Portuguese"),
|
||||
("pt-br", "Brazilian Portuguese"),
|
||||
("ro", "Romanian"),
|
||||
("ru", "Russian"),
|
||||
("sk", "Slovak"),
|
||||
("sl", "Slovenian"),
|
||||
("sq", "Albanian"),
|
||||
("sr", "Serbian"),
|
||||
("sr-latn", "Serbian Latin"),
|
||||
("sv", "Swedish"),
|
||||
("sw", "Swahili"),
|
||||
("ta", "Tamil"),
|
||||
("te", "Telugu"),
|
||||
("tg", "Tajik"),
|
||||
("th", "Thai"),
|
||||
("tk", "Turkmen"),
|
||||
("tr", "Turkish"),
|
||||
("tt", "Tatar"),
|
||||
("udm", "Udmurt"),
|
||||
("ug", "Uyghur"),
|
||||
("uk", "Ukrainian"),
|
||||
("ur", "Urdu"),
|
||||
("uz", "Uzbek"),
|
||||
("vi", "Vietnamese"),
|
||||
("zh-hans", "Simplified Chinese"),
|
||||
("zh-hant", "Traditional Chinese"),
|
||||
],
|
||||
default="en",
|
||||
max_length=7,
|
||||
),
|
||||
),
|
||||
(
|
||||
"publisher",
|
||||
models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
to="bookshelf.publisher",
|
||||
),
|
||||
),
|
||||
(
|
||||
"tags",
|
||||
models.ManyToManyField(
|
||||
blank=True, related_name="magazine", to="metadata.tag"
|
||||
),
|
||||
),
|
||||
],
|
||||
options={
|
||||
"ordering": ["name"],
|
||||
},
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name="MagazineIssue",
|
||||
fields=[
|
||||
(
|
||||
"basebook_ptr",
|
||||
models.OneToOneField(
|
||||
auto_created=True,
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
parent_link=True,
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
to="bookshelf.basebook",
|
||||
),
|
||||
),
|
||||
("issue_number", models.CharField(max_length=100)),
|
||||
(
|
||||
"publication_month",
|
||||
models.SmallIntegerField(
|
||||
blank=True,
|
||||
choices=[
|
||||
(1, "January"),
|
||||
(2, "February"),
|
||||
(3, "March"),
|
||||
(4, "April"),
|
||||
(5, "May"),
|
||||
(6, "June"),
|
||||
(7, "July"),
|
||||
(8, "August"),
|
||||
(9, "September"),
|
||||
(10, "October"),
|
||||
(11, "November"),
|
||||
(12, "December"),
|
||||
],
|
||||
null=True,
|
||||
),
|
||||
),
|
||||
(
|
||||
"magazine",
|
||||
models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
related_name="issue",
|
||||
to="bookshelf.magazine",
|
||||
),
|
||||
),
|
||||
],
|
||||
options={
|
||||
"ordering": ["magazine", "issue_number"],
|
||||
"unique_together": {("magazine", "issue_number")},
|
||||
},
|
||||
bases=("bookshelf.basebook",),
|
||||
),
|
||||
]
|
||||
@@ -3,6 +3,8 @@ import shutil
|
||||
from django.db import models
|
||||
from django.conf import settings
|
||||
from django.urls import reverse
|
||||
from django.utils.dates import MONTHS
|
||||
from django.core.exceptions import ValidationError
|
||||
from django_countries.fields import CountryField
|
||||
|
||||
from ram.utils import DeduplicatedStorage
|
||||
@@ -153,3 +155,72 @@ class Catalog(BaseBook):
|
||||
def get_scales(self):
|
||||
return "/".join([s.scale for s in self.scales.all()])
|
||||
get_scales.short_description = "Scales"
|
||||
|
||||
|
||||
class Magazine(BaseModel):
|
||||
name = models.CharField(max_length=200)
|
||||
publisher = models.ForeignKey(Publisher, on_delete=models.CASCADE)
|
||||
ISBN = models.CharField(max_length=17, blank=True) # 13 + dashes
|
||||
image = models.ImageField(
|
||||
blank=True,
|
||||
upload_to=book_image_upload,
|
||||
storage=DeduplicatedStorage,
|
||||
)
|
||||
language = models.CharField(
|
||||
max_length=7,
|
||||
choices=settings.LANGUAGES,
|
||||
default='en'
|
||||
)
|
||||
tags = models.ManyToManyField(
|
||||
Tag, related_name="magazine", blank=True
|
||||
)
|
||||
|
||||
def delete(self, *args, **kwargs):
|
||||
shutil.rmtree(
|
||||
os.path.join(
|
||||
settings.MEDIA_ROOT, "images", "magazines", str(self.uuid)
|
||||
),
|
||||
ignore_errors=True
|
||||
)
|
||||
super(Magazine, self).delete(*args, **kwargs)
|
||||
|
||||
class Meta:
|
||||
ordering = ["name"]
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
def get_absolute_url(self):
|
||||
return reverse(
|
||||
"bookshelf_item",
|
||||
kwargs={"selector": "magazine", "uuid": self.uuid}
|
||||
)
|
||||
|
||||
|
||||
class MagazineIssue(BaseBook):
|
||||
magazine = models.ForeignKey(
|
||||
Magazine, on_delete=models.CASCADE, related_name="issue"
|
||||
)
|
||||
issue_number = models.CharField(max_length=100)
|
||||
publication_month = models.SmallIntegerField(
|
||||
null=True,
|
||||
blank=True,
|
||||
choices=MONTHS.items()
|
||||
)
|
||||
|
||||
class Meta:
|
||||
unique_together = ("magazine", "issue_number")
|
||||
ordering = ["magazine", "issue_number"]
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.magazine.name} - {self.issue_number}"
|
||||
|
||||
def clean(self):
|
||||
if self.magazine.published is False and self.published is True:
|
||||
raise ValidationError(
|
||||
"Cannot set an issue as published if the magazine is not "
|
||||
"published."
|
||||
)
|
||||
|
||||
def preview(self):
|
||||
return self.image.first().image_thumbnail(100)
|
||||
|
||||
16
ram/bookshelf/static/admin/js/magazine_issue_defaults.js
Normal file
16
ram/bookshelf/static/admin/js/magazine_issue_defaults.js
Normal file
@@ -0,0 +1,16 @@
|
||||
document.addEventListener('formset:added', function(event) {
|
||||
const newForm = event.target; // the new inline form element
|
||||
|
||||
const defaultLanguage = document.querySelector('#id_language').value;
|
||||
const defaultStatus = document.querySelector('#id_published').checked;
|
||||
|
||||
const languageInput = newForm.querySelector('select[name$="language"]');
|
||||
const statusInput = newForm.querySelector('input[name$="published"]');
|
||||
|
||||
if (languageInput) {
|
||||
languageInput.value = defaultLanguage;
|
||||
}
|
||||
if (statusInput) {
|
||||
statusInput.checked = defaultStatus;
|
||||
}
|
||||
});
|
||||
@@ -1,4 +1,4 @@
|
||||
from ram.utils import git_suffix
|
||||
|
||||
__version__ = "0.17.15"
|
||||
__version__ = "0.18.00"
|
||||
__version__ += git_suffix(__file__)
|
||||
|
||||
@@ -150,7 +150,7 @@ REST_FRAMEWORK = {
|
||||
}
|
||||
|
||||
TINYMCE_DEFAULT_CONFIG = {
|
||||
"height": "500px",
|
||||
"height": "300px",
|
||||
"menubar": False,
|
||||
"plugins": "autolink lists link image charmap preview anchor "
|
||||
"searchreplace visualblocks code fullscreen insertdatetime media "
|
||||
|
||||
65
ram/repository/migrations/0004_magazineissuedocument.py
Normal file
65
ram/repository/migrations/0004_magazineissuedocument.py
Normal file
@@ -0,0 +1,65 @@
|
||||
# Generated by Django 6.0 on 2025-12-08 17:47
|
||||
|
||||
import django.db.models.deletion
|
||||
import ram.utils
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("bookshelf", "0025_magazine_magazineissue"),
|
||||
(
|
||||
"repository",
|
||||
"0003_alter_bookdocument_file_alter_catalogdocument_file_and_more",
|
||||
),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name="MagazineIssueDocument",
|
||||
fields=[
|
||||
(
|
||||
"id",
|
||||
models.BigAutoField(
|
||||
auto_created=True,
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
verbose_name="ID",
|
||||
),
|
||||
),
|
||||
("description", models.CharField(blank=True, max_length=128)),
|
||||
(
|
||||
"file",
|
||||
models.FileField(
|
||||
storage=ram.utils.DeduplicatedStorage, upload_to="files/"
|
||||
),
|
||||
),
|
||||
("creation_time", models.DateTimeField(auto_now_add=True)),
|
||||
("updated_time", models.DateTimeField(auto_now=True)),
|
||||
(
|
||||
"private",
|
||||
models.BooleanField(
|
||||
default=False,
|
||||
help_text="Document will be visible only to logged users",
|
||||
),
|
||||
),
|
||||
(
|
||||
"issue",
|
||||
models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
related_name="document",
|
||||
to="bookshelf.magazineissue",
|
||||
),
|
||||
),
|
||||
],
|
||||
options={
|
||||
"verbose_name_plural": "Magazines documents",
|
||||
"constraints": [
|
||||
models.UniqueConstraint(
|
||||
fields=("issue", "file"), name="unique_issue_file"
|
||||
)
|
||||
],
|
||||
},
|
||||
),
|
||||
]
|
||||
@@ -1,12 +1,11 @@
|
||||
from django.db import models
|
||||
from django.core.exceptions import ValidationError
|
||||
|
||||
from tinymce import models as tinymce
|
||||
|
||||
from ram.models import PrivateDocument
|
||||
from metadata.models import Decoder, Shop, Tag
|
||||
from roster.models import RollingStock
|
||||
from bookshelf.models import Book, Catalog
|
||||
from bookshelf.models import Book, Catalog, MagazineIssue
|
||||
|
||||
|
||||
class GenericDocument(PrivateDocument):
|
||||
@@ -77,6 +76,20 @@ class CatalogDocument(PrivateDocument):
|
||||
]
|
||||
|
||||
|
||||
class MagazineIssueDocument(PrivateDocument):
|
||||
issue = models.ForeignKey(
|
||||
MagazineIssue, on_delete=models.CASCADE, related_name="document"
|
||||
)
|
||||
|
||||
class Meta:
|
||||
verbose_name_plural = "Magazines documents"
|
||||
constraints = [
|
||||
models.UniqueConstraint(
|
||||
fields=["issue", "file"], name="unique_issue_file"
|
||||
)
|
||||
]
|
||||
|
||||
|
||||
class RollingStockDocument(PrivateDocument):
|
||||
rolling_stock = models.ForeignKey(
|
||||
RollingStock, on_delete=models.CASCADE, related_name="document"
|
||||
|
||||
Reference in New Issue
Block a user