Merge develop into staging, 13 June 2024

config/nginx/conf.d/cantusdb.conf.development

@@ -23,17 +23,9 @@ server {
         alias /resources/api_cache/concordances.json;
         expires modified +24h;
     }
-
-    location = /style.css {
-        root /;
-    }
-    location = /background.jpg {
-        root /;
-    }
-    location = /CantusLogoSmall.gif {
-        root /;
-    }
-    location = /favicon.ico {
+
+    error_page 500 /500.html;
+    location = /500.html {
         root /;
     }
 
@@ -45,4 +37,4 @@ server {
     location = /504.html {
         root /;
     }
-}
+}

cron/management/manage.sh

@@ -7,4 +7,4 @@
 DOCKER_COMPOSE_FILE=$1                                              # This is the path to the docker-compose file.
 COMMAND=$2                                                          # This is the command to execute.
 
-/usr/local/bin/docker compose -f $DOCKER_COMPOSE_FILE exec -T django python manage.py $COMMAND
+/usr/bin/docker compose -f $DOCKER_COMPOSE_FILE exec -T django python manage.py $COMMAND

django/cantusdb_project/cantusindex.py

@@ -91,9 +91,12 @@ def get_suggested_chant(
         # mostly, in case of a timeout within get_json_from_ci_api
         return None
 
-    fulltext: str = json["info"]["field_full_text"]
-    incipit: str = " ".join(fulltext.split(" ")[:5])
-    genre_name: str = json["info"]["field_genre"]
+    try:
+        fulltext: str = json["info"]["field_full_text"]
+        incipit: str = " ".join(fulltext.split(" ")[:5])
+        genre_name: str = json["info"]["field_genre"]
+    except TypeError:
+        return None
     genre_id: Optional[int] = None
     try:
         genre_id = Genre.objects.get(name=genre_name).id

django/cantusdb_project/main_app/admin/__init__.py

@@ -0,0 +1,12 @@
+from main_app.admin.century import CenturyAdmin
+from main_app.admin.chant import ChantAdmin
+from main_app.admin.differentia import DifferentiaAdmin
+from main_app.admin.feast import FeastAdmin
+from main_app.admin.genre import GenreAdmin
+from main_app.admin.notation import NotationAdmin
+from main_app.admin.office import OfficeAdmin
+from main_app.admin.provenance import ProvenanceAdmin
+from main_app.admin.rism_siglum import RismSiglumAdmin
+from main_app.admin.segment import SegmentAdmin
+from main_app.admin.sequence import SequenceAdmin
+from main_app.admin.source import SourceAdmin

django/cantusdb_project/main_app/admin/base_admin.py

@@ -0,0 +1,27 @@
+from reversion.admin import VersionAdmin
+
+
+# these fields should not be editable by all classes
+EXCLUDE = ("json_info",)
+
+
+READ_ONLY = (
+    "created_by",
+    "last_updated_by",
+    "date_created",
+    "date_updated",
+)
+
+
+class BaseModelAdmin(VersionAdmin):
+    exclude = EXCLUDE
+    readonly_fields = READ_ONLY
+
+    # if an object is created in the admin interface, assign the user to the created_by field
+    # else if an object is updated in the admin interface, assign the user to the last_updated_by field
+    def save_model(self, request, obj, form, change):
+        if change:
+            obj.last_updated_by = request.user
+        else:
+            obj.created_by = request.user
+        super().save_model(request, obj, form, change)

django/cantusdb_project/main_app/admin/century.py

@@ -0,0 +1,11 @@
+from django.contrib import admin
+
+from main_app.admin.base_admin import BaseModelAdmin
+from main_app.forms import AdminCenturyForm
+from main_app.models import Century
+
+
+@admin.register(Century)
+class CenturyAdmin(BaseModelAdmin):
+    search_fields = ("name",)
+    form = AdminCenturyForm

django/cantusdb_project/main_app/admin/chant.py

@@ -0,0 +1,53 @@
+from django.contrib import admin
+
+from main_app.admin.base_admin import EXCLUDE, READ_ONLY, BaseModelAdmin
+from main_app.forms import AdminChantForm
+from main_app.models import Chant
+
+
+@admin.register(Chant)
+class ChantAdmin(BaseModelAdmin):
+
+    @admin.display(description="Source Siglum")
+    def get_source_siglum(self, obj):
+        if obj.source:
+            return obj.source.siglum
+
+    list_display = (
+        "incipit",
+        "get_source_siglum",
+        "genre",
+    )
+    search_fields = (
+        "title",
+        "incipit",
+        "cantus_id",
+        "id",
+    )
+
+    readonly_fields = READ_ONLY + ("incipit",)
+
+    list_filter = (
+        "genre",
+        "office",
+    )
+    exclude = EXCLUDE + (
+        "col1",
+        "col2",
+        "col3",
+        "next_chant",
+        "s_sequence",
+        "is_last_chant_in_feast",
+        "visible_status",
+        "date",
+        "volpiano_notes",
+        "volpiano_intervals",
+        "title",
+        "differentiae_database",
+    )
+    form = AdminChantForm
+    raw_id_fields = (
+        "source",
+        "feast",
+    )
+    ordering = ("source__siglum",)