Merge pull request #122 from UCL-ARC/fix/url_and_bib

Fix/url and bib

Author: acholyn

mod_app/admin/bibliography_admin.py

@@ -18,12 +18,22 @@ class Meta:
 @admin.register(BibliographyItem)
 class BibliographyItemAdmin(admin.ModelAdmin):
     model = BibliographyItem
-    list_display = ["safe_citation"]
+    list_display = ["safe_citation", "safe_annotation"]
     form = BIAdminForm
+    search_fields = ["full_citation", "annotation"]
 
     def safe_citation(self, obj):
         return format_html(obj.full_citation)
 
+    def safe_annotation(self, obj):
+        if obj.annotation is not None:
+            return format_html(obj.annotation)
+        else:
+            return ""
+
     safe_citation.allow_tags = True
     safe_citation.short_description = "Full Citation"
     safe_citation.admin_order_field = "full_citation"
+    safe_annotation.allow_tags = True
+    safe_annotation.short_description = "Annotations"
+    safe_annotation.admin_order_field = "annotation"

mod_app/admin/film_admin.py

@@ -3,6 +3,7 @@
 from django.db import models
 from django.template.defaultfilters import truncatechars_html
 from django.utils.html import format_html
+import html
 
 from mod_app.admin.link_admin import (
     DrawingInline,
@@ -29,6 +30,8 @@ class FilmAnalysisInline(admin.TabularInline):
         "grp-collapse",
         "grp-open",
     ]
+    verbose_name = "Analysis"
+    verbose_name_plural = "Analyses"
 
 
 class TRInline(admin.TabularInline):
@@ -38,6 +41,8 @@ class TRInline(admin.TabularInline):
         "grp-collapse",
         "grp-open",
     ]
+    verbose_name = "Teaching Resources"
+    verbose_name_plural = "Teaching Resources"
 
 
 @admin.register(Film)
@@ -49,7 +54,13 @@ class Media:
         js = ("admin/js/mentionsPluginConfig.js",)
 
     autocomplete_fields = ["genre"]
-    search_fields = ["title", "alt_titles"]
+    search_fields = [
+        "title",
+        "alt_titles",
+        "production_company",
+        "production_country",
+        "release_date",
+    ]
     formfield_overrides = {
         models.TextField: {
             "widget": CKEditorWidget(),
@@ -112,18 +123,30 @@ def safe_temporary_images(self, obj):
     safe_temporary_images.allow_tags = True
     safe_temporary_images.short_description = "List Images"
 
+    def safe_bibliography(self, obj):
+        bib_items = obj.bibliography.all()
+        formatted_items = [
+            format_html(
+                "<li>{}</li>", format_html(html.unescape(bib_item.full_citation))
+            )
+            for bib_item in bib_items
+        ]
+        return format_html("<ul>{}</ul>", format_html("".join(formatted_items)))
+
+    safe_bibliography.short_description = "Bibliography"
+    safe_bibliography.allow_tags = True
+
     def preview_video(self, obj):
         if obj.videos.first():
-            # format for working with mediacentral embeds
+            # format for working with mediacentral embeds and youtube embeds
             return format_html(
                 '<div"><iframe src="{}" frameborder="0"  scrolling="no" allowfullscreen></iframe></div>',
                 obj.videos.first(),
             )
-        # previously tried to use youtube but that seems to be more tricky than expected and may not be used
         else:
             return "-"
 
-    readonly_fields = ("bibliography",)
+    readonly_fields = ("safe_bibliography",)
     fieldsets = (
         (
             "Main Information (Filmic Section)",
@@ -140,7 +163,7 @@ def preview_video(self, obj):
                 ),
             },
         ),
-        (None, {"classes": ("placeholder sources-group",), "fields": ()}),
+        (None, {"classes": ("placeholder Source_film-group",), "fields": ()}),
         (None, {"classes": ("placeholder videos-group",), "fields": ()}),
         (
             "Technical Section",
@@ -188,13 +211,14 @@ def preview_video(self, obj):
                     "comments",
                     "temporary_images",
                 ),
+                "description": "Mentions are available here and will contibute to the bibliography.",
             },
         ),
         (
             "Bibliography",
             {
                 "classes": ("grp-collapse",),
-                "fields": ("bibliography",),
+                "fields": ("safe_bibliography",),
                 "description": "Note: This section updates on save, and some items may not be visible immediately.",
             },
         ),

mod_app/admin/link_admin.py

@@ -5,13 +5,14 @@
 
 
 class SourceInline(PreviewMixin, admin.TabularInline):
-    model = Source
+    model = Film.sources.through
     extra = 1
     classes = [
-        "inline-inline",
         "grp-collapse",
         "grp-closed",
     ]
+    verbose_name = "Source"
+    verbose_name_plural = "Sources"
 
 
 class VideoInline(PreviewMixin, admin.TabularInline):
@@ -123,9 +124,15 @@ class VideoAdmin(PreviewMixin, admin.ModelAdmin):
 
 @admin.register(Source)
 class SourceAdmin(PreviewMixin, admin.ModelAdmin):
-    search_fields = ["description", "url"]
+    def list_films(self, obj):
+        return ", ".join([film.title for film in obj.film.all()])
+
+    list_films.short_description = "Films"
+
+    search_fields = ["description", "url", "film__title"]
+    filter_horizontal = ("film",)
     exclude = ["is_source"]
-    list_display = ["description", "film", "url", "preview"]
+    list_display = ["description", "list_films", "url", "preview"]
 
 
 @admin.register(OtherLink)

mod_app/admin/teaching_analysis_admin.py

@@ -3,6 +3,7 @@
 from django.contrib import admin
 from django.template.defaultfilters import truncatechars_html
 from django.utils.html import format_html
+import html
 
 from ..models import Analysis, TeachingResources
 
@@ -23,6 +24,8 @@ class TRAnalysisInline(admin.TabularInline):
         "grp-collapse",
         "grp-open",
     ]
+    verbose_name = "Analysis"
+    verbose_name_plural = "Analyses"
 
 
 class TRAdminForm(forms.ModelForm):
@@ -44,7 +47,8 @@ class Media:
 
     form = AnalysisAdminForm
     autocomplete_fields = ["films", "topics", "tags", "teaching_resources"]
-    readonly_fields = ("bibliography",)
+    readonly_fields = ("safe_bibliography",)
+    exclude = ["bibliography"]
     list_display = [
         "dynamic_title",
         "related_films",
@@ -85,6 +89,19 @@ def safe_content(self, obj):
     safe_content.allow_tags = True
     safe_content.short_description = "Content"
 
+    def safe_bibliography(self, obj):
+        bib_items = obj.bibliography.all()
+        formatted_items = [
+            format_html(
+                "<li>{}</li>", format_html(html.unescape(bib_item.full_citation))
+            )
+            for bib_item in bib_items
+        ]
+        return format_html("<ul>{}</ul>", format_html("".join(formatted_items)))
+
+    safe_bibliography.short_description = "Bibliography"
+    safe_bibliography.allow_tags = True
+
 
 @admin.register(TeachingResources)
 class TeachingResourcesAdmin(AnalysisAdmin):
@@ -97,7 +114,8 @@ class Media:
     form = TRAdminForm
     inlines = [TRAnalysisInline]
     autocomplete_fields = ["films", "topics", "tags", "clips"]
-    readonly_fields = ("bibliography",)
+    readonly_fields = ("safe_bibliography",)
+    exclude = ["bibliography"]
 
     list_display = [
         "dynamic_title",
@@ -106,3 +124,16 @@ class Media:
         "list_tags",
     ]
     search_fields = ["title", "tags", "topics"]
+
+    def safe_bibliography(self, obj):
+        bib_items = obj.bibliography.all()
+        formatted_items = [
+            format_html(
+                "<li>{}</li>", format_html(html.unescape(bib_item.full_citation))
+            )
+            for bib_item in bib_items
+        ]
+        return format_html("<ul>{}</ul>", format_html("".join(formatted_items)))
+
+    safe_bibliography.short_description = "Bibliography"
+    safe_bibliography.allow_tags = True

mod_app/migrations/0025_increase_url_length_make_sources_m2m.py

@@ -0,0 +1,122 @@
+# Generated by Django 4.2.5 on 2024-10-04 11:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("mod_app", "0024_fix_migrations"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="drawing",
+            name="url",
+            field=models.URLField(
+                blank=True,
+                help_text="url to the item you'd like to link",
+                max_length=500,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="otherlink",
+            name="url",
+            field=models.URLField(
+                blank=True,
+                help_text="url to the item you'd like to link",
+                max_length=500,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="postcard",
+            name="url",
+            field=models.URLField(
+                blank=True,
+                help_text="url to the item you'd like to link",
+                max_length=500,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="poster",
+            name="url",
+            field=models.URLField(
+                blank=True,
+                help_text="url to the item you'd like to link",
+                max_length=500,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="pressbook",
+            name="url",
+            field=models.URLField(
+                blank=True,
+                help_text="url to the item you'd like to link",
+                max_length=500,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="programme",
+            name="url",
+            field=models.URLField(
+                blank=True,
+                help_text="url to the item you'd like to link",
+                max_length=500,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="publicity",
+            name="url",
+            field=models.URLField(
+                blank=True,
+                help_text="url to the item you'd like to link",
+                max_length=500,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="script",
+            name="url",
+            field=models.URLField(
+                blank=True,
+                help_text="url to the item you'd like to link",
+                max_length=500,
+            ),
+        ),
+        migrations.RemoveField(
+            model_name="source",
+            name="film",
+        ),
+        migrations.AlterField(
+            model_name="source",
+            name="url",
+            field=models.URLField(
+                blank=True,
+                help_text="url to the item you'd like to link",
+                max_length=500,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="still",
+            name="url",
+            field=models.URLField(
+                blank=True,
+                help_text="url to the item you'd like to link",
+                max_length=500,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="video",
+            name="url",
+            field=models.URLField(
+                blank=True,
+                help_text="url to the item you'd like to link",
+                max_length=500,
+            ),
+        ),
+        migrations.AddField(
+            model_name="source",
+            name="film",
+            field=models.ManyToManyField(
+                blank=True, related_name="sources", to="mod_app.film"
+            ),
+        ),
+    ]

mod_app/models/feedback_model.py

@@ -30,4 +30,4 @@ def __str__(self):
     def save(self, *args, **kwargs):
         super().save(*args, **kwargs)
 
-        update_bibliography(self, self.content)
+        update_bibliography(self, [self.content])

mod_app/models/film_model.py

@@ -148,5 +148,6 @@ def clean(self, *args, **kwargs):
 
     def save(self, *args, **kwargs):
         super().save(*args, **kwargs)
+        fields = [self.print_comments, self.comments, self.temporary_images]
 
-        update_bibliography(self, self.print_comments)
+        update_bibliography(self, fields)

mod_app/models/project_note_model.py

@@ -30,4 +30,4 @@ def __str__(self):
     def save(self, *args, **kwargs):
         super().save(*args, **kwargs)
 
-        update_bibliography(self, self.content)
+        update_bibliography(self, [self.content])

mod_app/models/support_models.py

@@ -22,6 +22,7 @@ def __str__(self):
     url = models.URLField(
         blank=True,
         help_text="url to the item you'd like to link",
+        max_length=500,
     )
     description = models.CharField(
         max_length=250,
@@ -43,6 +44,8 @@ class Source(BaseLinkModel):
     class Meta:
         verbose_name = "Source"
 
+    film = models.ManyToManyField("Film", blank=True, related_name="sources")
+
 
 class FileLink(BaseLinkModel):
     class Meta: