Fully implement UI for magazines

ram/bookshelf/admin.py

@@ -475,7 +475,6 @@ class MagazineAdmin(SortableAdminBase, admin.ModelAdmin):
                 "fields": (
                     "published",
                     "name",
-                    "website",
                     "publisher",
                     "ISBN",
                     "language",

ram/bookshelf/migrations/0027_magazine_website.py

@@ -1,18 +0,0 @@
-# Generated by Django 6.0 on 2025-12-12 14:02
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookshelf", "0026_alter_basebook_language_alter_magazine_image_and_more"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="magazine",
-            name="website",
-            field=models.URLField(blank=True),
-        ),
-    ]

ram/bookshelf/models.py

@@ -1,6 +1,5 @@
 import os
 import shutil
-from urllib.parse import urlparse
 from django.db import models
 from django.conf import settings
 from django.urls import reverse
@@ -170,7 +169,6 @@ class Catalog(BaseBook):
 class Magazine(BaseModel):
     name = models.CharField(max_length=200)
     publisher = models.ForeignKey(Publisher, on_delete=models.CASCADE)
-    website = models.URLField(blank=True)
     ISBN = models.CharField(max_length=17, blank=True)  # 13 + dashes
     image = models.ImageField(
         blank=True,
@@ -207,10 +205,6 @@ class Magazine(BaseModel):
             kwargs={"uuid": self.uuid}
         )
 
-    def website_short(self):
-        if self.website:
-            return urlparse(self.website).netloc.replace("www.", "")
-
 
 class MagazineIssue(BaseBook):
     magazine = models.ForeignKey(

ram/bookshelf/serializers.py

@@ -49,5 +49,3 @@ class CatalogSerializer(serializers.ModelSerializer):
             "price",
         )
         read_only_fields = ("creation_time", "updated_time")
-
-# FIXME: add Magazine and MagazineIssue serializers

ram/bookshelf/views.py

@@ -38,5 +38,3 @@ class CatalogGet(RetrieveAPIView):
 
     def get_queryset(self):
         return Book.objects.get_published(self.request.user)
-
-# FIXME: add Magazine and MagazineIssue views

ram/metadata/models.py

@@ -1,5 +1,4 @@
 import os
-from urllib.parse import urlparse
 from django.db import models
 from django.urls import reverse
 from django.conf import settings
@@ -58,10 +57,6 @@ class Manufacturer(models.Model):
             },
         )
 
-    def website_short(self):
-        if self.website:
-            return urlparse(self.website).netloc.replace("www.", "")
-
     def logo_thumbnail(self):
         return get_image_preview(self.logo.url)
 

ram/portal/templates/bookshelf/book.html

@@ -61,7 +61,8 @@
                     <thead>
                       <tr>
                         <th colspan="2" scope="row">
-                          {{ label|capfirst }}
+                          {% if type == "catalog" %}Catalog
+                          {% elif type == "book" %}Book{% endif %}
                         </th>
                       </tr>
                     </thead>
@@ -69,9 +70,7 @@
                       {% if type == "catalog" %}
                       <tr>
                         <th class="w-33" scope="row">Manufacturer</th>
-                        <td>
+                        <td>{{ book.manufacturer }}</td>
-                          <a href="{% url 'filtered' _filter="manufacturer" search=book.manufacturer.slug %}">{{ book.manufacturer }}{% if book.manufacturer.website %}</a> <a href="{{ book.manufacturer.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
-                        </td>
                       </tr>
                       <tr>
                         <th class="w-33" scope="row">Scales</th>
@@ -98,10 +97,7 @@
                       {% elif type == "magazineissue" %}
                       <tr>
                         <th class="w-33" scope="row">Magazine</th>
-                        <td>
+                        <td><a href="{% url 'magazine' book.magazine.pk %}">{{ book.magazine }}</a></td>
-                          <a href="{% url 'magazine' book.magazine.pk %}">{{ book.magazine }}</a>
-                          {% if book.magazine.website %} <a href="{{ book.magazine.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
-                        </td>
                       </tr>
                       <tr>
                         <th class="w-33" scope="row">Publisher</th>
@@ -116,7 +112,7 @@
                       </tr>
                       <tr>
                         <th class="w-33" scope="row">Date</th>
-                        <td>{{ book.publication_year|default:"-" }} / {{ book.get_publication_month_display|default:"-" }}</td>
+                        <td>{{ book.publication_year|default:"-" }} / {{ book.publication_month|default:"-" }}</td>
                       </tr>
                       {% endif %}
                       <tr>

ram/portal/templates/cards/book.html

@@ -24,7 +24,7 @@
                 <thead>
                   <tr>
                     <th colspan="2" scope="row">
-                      {{ d.label|capfirst }}
+                      {{ d.type | capfirst }}
                       <div class="float-end">
                         {% if not d.item.published %}
                         <span class="badge text-bg-warning">Unpublished</span>
@@ -37,9 +37,7 @@
                   {% if d.type == "catalog" %}
                   <tr>
                     <th class="w-33" scope="row">Manufacturer</th>
-                    <td>
+                    <td>{{ d.item.manufacturer }}</td>
-                      <a href="{% url 'filtered' _filter="manufacturer" search=d.item.manufacturer.slug %}">{{ d.item.manufacturer }}{% if d.item.manufacturer.website %}</a> <a href="{{ d.item.manufacturer.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
-                    </td>
                   </tr>
                   <tr>
                     <th class="w-33" scope="row">Scales</th>

ram/portal/templates/cards/magazine.html

@@ -1,5 +1,4 @@
 {% load static %}
-{% load dynamic_url %}
       <div class="col">
         <div class="card shadow-sm">
           {% if d.type == "magazine" %}
@@ -42,8 +41,7 @@
               <thead>
                 <tr>
                   <th colspan="2" scope="row">
-                    {{ d.label|capfirst }}
+                    {{ d.type | capfirst }}
-
                     <div class="float-end">
                       {% if not d.item.published %}
                       <span class="badge text-bg-warning">Unpublished</span>
@@ -58,11 +56,6 @@
                   <th class="w-33" scope="row">Magazine</th>
                   <td>{{ d.item.magazine }}</td>
                 </tr>
-                {% else %}
-                <tr>
-                  <th class="w-33" scope="row">Website</th>
-                  <td>{% if d.item.website %}<a href="{{ d.item.website }}" target="_blank">{{ d.item.website_short }}</td>{% else %}-{% endif %}</td>
-                </tr>
                 {% endif %}
                 <tr>
                   <th class="w-33" scope="row">Publisher</th>
@@ -78,7 +71,7 @@
                 </tr>
                 <tr>
                   <th class="w-33" scope="row">Date</th>
-                  <td>{{ d.item.publication_year|default:"-" }} / {{ d.item.get_publication_month_display|default:"-" }}</td>
+                  <td>{{ d.item.publication_year|default:"-" }} / {{ d.item.publication_month|default:"-" }}</td>
                 </tr>
                 <tr>
                   <th class="w-33" scope="row">Pages</th>
@@ -97,7 +90,7 @@
               {% else %}
               <a class="btn btn-sm btn-outline-primary" href="{{ d.item.get_absolute_url }}">Show all data</a>
               {% endif %}
-              {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% dynamic_admin_url 'bookshelf' d.type d.item.pk %}">Edit</a>{% endif %}
+              {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:bookshelf_magazineissue_change'  d.item.pk %}">Edit</a>{% endif %}
             </div>
           </div>
         </div>

ram/portal/templates/cards/manufacturer.html

@@ -17,10 +17,12 @@
                     <td><img class="logo" src="{{ d.item.logo.url }}" alt="{{ d.item.name }} logo"></td>
                   </tr>
                   {% endif %}
+                  {% if d.item.website %}
                   <tr>
                     <th class="w-33" scope="row">Website</th>
-                    <td>{% if d.item.website %}<a href="{{ d.item.website }}" target="_blank">{{ d.item.website_short }}</td>{% else %}-{% endif %}</td>
+                    <td><a href="{{ d.item.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a></td>
                   </tr>
+                  {% endif %}
                   <tr>
                     <th class="w-33" scope="row">Category</th>
                     <td>{{ d.item.category | title }}</td>

ram/portal/templates/magazine.html

@@ -88,7 +88,7 @@
                   <tbody class="table-group-divider">
                     <tr>
                       <th class="w-33" scope="row">Name</th>
-                      <td>{{ magazine }}</td>
+                      <td>{{ magazine }} </td>
                     </tr>
                     <tr>
                       <th class="w-33" scope="row">Publisher</th>
@@ -97,14 +97,6 @@
                         {% if magazine.publisher.website %} <a href="{{ magazine.publisher.website }}" target="_blank"><i class="bi bi-box-arrow-up-right"></i></a>{% endif %}
                       </td>
                     </tr>
-                    <tr>
-                      <th class="w-33" scope="row">Website</th>
-                      <td>{% if magazine.website %}<a href="{{ magazine.website }}" target="_blank">{{ magazine.website_short }}</td>{% else %}-{% endif %}</td>
-                    </tr>
-                    <tr>
-                      <th class="w-33" scope="row">Language</th>
-                      <td>{{ magazine.get_language_display }}</td>
-                    </tr>
                     <tr>
                       <th scope="row">ISBN</th>
                       <td>{{ magazine.ISBN | default:"-" }}</td>

ram/portal/views.py

@@ -73,14 +73,11 @@ class GetData(View):
             .filter(self.filter)
         )
 
-    def get(self, request, page=1):
+    def get(self, request, filter=Q(), page=1):
+        self.filter = filter
         data = []
         for item in self.get_data(request):
-            data.append({
+            data.append({"type": self.item_type, "item": item})
-                "type": self.item_type,
-                "label": self.item_type.capitalize(),
-                "item": item
-            })
 
         paginator = Paginator(data, get_items_per_page())
         data = paginator.get_page(page)
@@ -672,7 +669,6 @@ class GetMagazine(View):
         data = [
             {
                 "type": "magazineissue",
-                "label": "Magazine issue",
                 "item": i,
             }
             for i in magazine.issue.get_published(request.user).all()
@@ -716,7 +712,6 @@ class GetMagazineIssue(View):
                 "documents": documents,
                 "properties": properties,
                 "type": "magazineissue",
-                "label": "Magazine issue",
             },
         )
 
@@ -747,7 +742,6 @@ class GetBookCatalog(View):
                 "documents": documents,
                 "properties": properties,
                 "type": selector,
-                "label": selector.capitalize(),
             },
         )
 

ram/ram/__init__.py

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