mirror of
https://github.com/daniviga/django-ram.git
synced 2026-02-03 17:40:39 +01:00
Compare commits
4 Commits
v0.18.9
...
1899747909
| Author | SHA1 | Date | |
|---|---|---|---|
|
1899747909
|
|||
|
0880bd0817
|
|||
|
74d7df2c8b
|
|||
|
c81508bbd5
|
@@ -22,6 +22,7 @@ from bookshelf.models import (
|
||||
Catalog,
|
||||
Magazine,
|
||||
MagazineIssue,
|
||||
TocEntry,
|
||||
)
|
||||
|
||||
|
||||
@@ -363,9 +364,23 @@ class CatalogAdmin(SortableAdminBase, admin.ModelAdmin):
|
||||
actions = [publish, unpublish, download_csv]
|
||||
|
||||
|
||||
class MagazineIssueToc(admin.TabularInline):
|
||||
model = TocEntry
|
||||
min_num = 0
|
||||
extra = 0
|
||||
fields = (
|
||||
"title",
|
||||
"subtitle",
|
||||
"authors",
|
||||
"page",
|
||||
"featured",
|
||||
)
|
||||
|
||||
|
||||
@admin.register(MagazineIssue)
|
||||
class MagazineIssueAdmin(SortableAdminBase, admin.ModelAdmin):
|
||||
inlines = (
|
||||
MagazineIssueToc,
|
||||
BookPropertyInline,
|
||||
BookImageInline,
|
||||
MagazineIssueDocInline,
|
||||
|
||||
53
ram/bookshelf/migrations/0030_tocentry.py
Normal file
53
ram/bookshelf/migrations/0030_tocentry.py
Normal file
@@ -0,0 +1,53 @@
|
||||
# Generated by Django 6.0 on 2025-12-29 11:02
|
||||
|
||||
import django.db.models.deletion
|
||||
import tinymce.models
|
||||
import uuid
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("bookshelf", "0029_alter_catalog_manufacturer_alter_catalog_scales"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name="TocEntry",
|
||||
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)),
|
||||
("title", models.CharField(max_length=200)),
|
||||
("subtitle", models.CharField(blank=True, max_length=200)),
|
||||
("authors", models.CharField(blank=True, max_length=256)),
|
||||
("page", models.SmallIntegerField()),
|
||||
("featured", models.BooleanField(default=False)),
|
||||
(
|
||||
"book",
|
||||
models.ForeignKey(
|
||||
on_delete=django.db.models.deletion.CASCADE,
|
||||
related_name="toc",
|
||||
to="bookshelf.basebook",
|
||||
),
|
||||
),
|
||||
],
|
||||
options={
|
||||
"verbose_name": "Table of Contents Entry",
|
||||
"verbose_name_plural": "Table of Contents Entries",
|
||||
"ordering": ["page"],
|
||||
},
|
||||
),
|
||||
]
|
||||
@@ -239,3 +239,35 @@ class MagazineIssue(BaseBook):
|
||||
return reverse(
|
||||
"issue", kwargs={"uuid": self.uuid, "magazine": self.magazine.uuid}
|
||||
)
|
||||
|
||||
|
||||
class TocEntry(BaseModel):
|
||||
book = models.ForeignKey(
|
||||
BaseBook, on_delete=models.CASCADE, related_name="toc"
|
||||
)
|
||||
title = models.CharField(max_length=200)
|
||||
subtitle = models.CharField(max_length=200, blank=True)
|
||||
authors = models.CharField(max_length=256, blank=True)
|
||||
page = models.SmallIntegerField()
|
||||
featured = models.BooleanField(
|
||||
default=False,
|
||||
)
|
||||
|
||||
class Meta:
|
||||
ordering = ["page"]
|
||||
verbose_name = "Table of Contents Entry"
|
||||
verbose_name_plural = "Table of Contents Entries"
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.title} (p. {self.page})"
|
||||
|
||||
def clean(self):
|
||||
if self.page < 1:
|
||||
raise ValidationError("Page number is invalid.")
|
||||
try:
|
||||
if self.page > self.book.number_of_pages:
|
||||
raise ValidationError(
|
||||
"Page number exceeds the publication's number of pages."
|
||||
)
|
||||
except TypeError:
|
||||
pass # number_of_pages is None
|
||||
|
||||
@@ -3,12 +3,19 @@
|
||||
|
||||
<div class="col">
|
||||
<div class="card shadow-sm">
|
||||
<div id="card-img-container" class="position-relative">
|
||||
{% if d.featured %}
|
||||
<span class="position-absolute translate-middle top-0 start-0 m-3 text-danger">
|
||||
<abbr title="Featured item"><i class="bi bi-heart-fill"></i></abbr>
|
||||
</span>
|
||||
{% endif %}
|
||||
{% if d.image.exists %}
|
||||
<a href="{{d.get_absolute_url}}"><img class="card-img-top" src="{{ d.image.first.image.url }}" alt="{{ d }}"></a>
|
||||
{% else %}
|
||||
<!-- Do not show the "Coming soon" image when running in a single card column mode (e.g. on mobile) -->
|
||||
<a href="{{d.get_absolute_url}}"><img class="card-img-top d-none d-sm-block" src="{% static DEFAULT_CARD_IMAGE %}" alt="{{ d }}"></a>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<p class="card-text" style="position: relative;">
|
||||
<strong>{{ d }}</strong>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from ram.utils import git_suffix
|
||||
|
||||
__version__ = "0.18.9"
|
||||
__version__ = "0.19.1"
|
||||
__version__ += git_suffix(__file__)
|
||||
|
||||
@@ -175,7 +175,12 @@ class RollingStock(BaseModel):
|
||||
def clean(self, *args, **kwargs):
|
||||
if self.featured:
|
||||
MAX = settings.FEATURED_ITEMS_MAX
|
||||
if RollingStock.objects.filter(featured=True).count() > MAX - 1:
|
||||
featured_count = (
|
||||
RollingStock.objects.filter(featured=True)
|
||||
.exclude(uuid=self.uuid)
|
||||
.count()
|
||||
)
|
||||
if featured_count > MAX - 1:
|
||||
raise ValidationError(
|
||||
"There are already {} featured items".format(MAX)
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user