Add the possbility to provide descriptions (#32)

to class, rolling stock, book
This commit is contained in:
2024-03-02 15:45:42 +01:00
committed by GitHub
parent e7d34ce8e0
commit 4b74a69f3f
9 changed files with 66 additions and 3 deletions

View File

@@ -0,0 +1,19 @@
# Generated by Django 5.0.2 on 2024-03-02 14:31
import tinymce.models
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("bookshelf", "0012_alter_book_notes"),
]
operations = [
migrations.AddField(
model_name="book",
name="description",
field=tinymce.models.HTMLField(blank=True),
),
]

View File

@@ -52,6 +52,7 @@ class Book(models.Model):
)
number_of_pages = models.SmallIntegerField(null=True, blank=True)
publication_year = models.SmallIntegerField(null=True, blank=True)
description = tinymce.HTMLField(blank=True)
purchase_date = models.DateField(null=True, blank=True)
tags = models.ManyToManyField(
Tag, related_name="bookshelf", blank=True

View File

@@ -54,6 +54,7 @@
<div class="tab-content" id="nav-tabContent">
<div class="tab-pane show active" id="nav-summary" role="tabpanel" aria-labelledby="nav-summary-tab">
<table class="table table-striped">
{{ book.description | safe }}
<thead>
<tr>
<th colspan="2" scope="row">Book</th>

View File

@@ -149,6 +149,7 @@
{% endif %}
</div>
<div class="tab-pane" id="nav-model" role="tabpanel" aria-labelledby="nav-model-tab">
{{ rolling_stock.description | safe }}
<table class="table table-striped">
<thead>
<tr>
@@ -205,6 +206,7 @@
{% endif %}
</div>
<div class="tab-pane" id="nav-class" role="tabpanel" aria-labelledby="nav-class-tab">
{{ class.description | safe }}
<table class="table table-striped">
<thead>
<tr>

View File

@@ -1,4 +1,4 @@
from ram.utils import git_suffix
__version__ = "0.10.0"
__version__ = "0.11.0"
__version__ += git_suffix(__file__)

View File

@@ -142,6 +142,7 @@ class RollingStockAdmin(SortableAdminBase, admin.ModelAdmin):
"manufacturer",
"item_number",
"era",
"description",
"production_year",
"purchase_date",
"notes",

View File

@@ -0,0 +1,19 @@
# Generated by Django 5.0.2 on 2024-03-02 13:30
import tinymce.models
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("roster", "0022_alter_rollingstock_notes_and_more"),
]
operations = [
migrations.AlterField(
model_name="rollingclass",
name="description",
field=tinymce.models.HTMLField(blank=True),
),
]

View File

@@ -0,0 +1,19 @@
# Generated by Django 5.0.2 on 2024-03-02 14:30
import tinymce.models
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("roster", "0023_alter_rollingclass_description"),
]
operations = [
migrations.AddField(
model_name="rollingstock",
name="description",
field=tinymce.models.HTMLField(blank=True),
),
]

View File

@@ -25,7 +25,7 @@ class RollingClass(models.Model):
identifier = models.CharField(max_length=128, unique=False)
type = models.ForeignKey(RollingStockType, on_delete=models.CASCADE)
company = models.ForeignKey(Company, on_delete=models.CASCADE)
description = models.CharField(max_length=256, blank=True)
description = tinymce.HTMLField(blank=True)
manufacturer = models.ForeignKey(
Manufacturer,
on_delete=models.CASCADE,
@@ -85,10 +85,11 @@ class RollingStock(models.Model):
era = models.CharField(max_length=32, blank=True)
production_year = models.SmallIntegerField(null=True, blank=True)
purchase_date = models.DateField(null=True, blank=True)
notes = tinymce.HTMLField(blank=True)
description = tinymce.HTMLField(blank=True)
tags = models.ManyToManyField(
Tag, related_name="rolling_stock", blank=True
)
notes = tinymce.HTMLField(blank=True)
creation_time = models.DateTimeField(auto_now_add=True)
updated_time = models.DateTimeField(auto_now=True)