Merge develop into staging; 16 July 2024

django/cantusdb_project/cantusindex.py

@@ -3,12 +3,14 @@
 Cantus Index's (CI's) various APIs.
 """
 
-import requests
-from typing import Optional, Union, Callable
-from main_app.models import Genre
 import json
+from typing import Optional, Union, Callable
+
+import requests
 from requests.exceptions import SSLError, Timeout, HTTPError
 
+from main_app.models import Genre
+
 CANTUS_INDEX_DOMAIN: str = "https://cantusindex.uwaterloo.ca"
 OLD_CANTUS_INDEX_DOMAIN: str = "https://cantusindex.org"
 DEFAULT_TIMEOUT: float = 2  # seconds

django/cantusdb_project/main_app/admin/filters.py

@@ -0,0 +1,17 @@
+from django.contrib.admin import SimpleListFilter
+
+
+class InputFilter(SimpleListFilter):
+    template = "admin/input_filter.html"
+
+    def lookups(self, request, model_admin):
+        return (),
+
+    def choices(self, changelist):
+        all_choice = next(super().choices(changelist))
+        all_choice["query_parts"] = (
+            (key, value)
+            for key, value in changelist.get_filters_params().items()
+            if key != self.parameter_name
+        )
+        yield all_choice

django/cantusdb_project/main_app/admin/institution.py

@@ -1,7 +1,21 @@
 from django.contrib import admin
+from django.urls import reverse
+from django.utils.safestring import mark_safe
 
 from main_app.admin.base_admin import BaseModelAdmin
-from main_app.models import Institution, InstitutionIdentifier
+from main_app.models import Institution, InstitutionIdentifier, Source
+
+
+class InstitutionSourceInline(admin.TabularInline):
+    model = Source
+    extra = 0
+    fields = ("link_id_field", "shelfmark", "published")
+    readonly_fields = ("link_id_field", "published", "shelfmark")
+    can_delete = False
+
+    def link_id_field(self, obj):
+        change_url = reverse('admin:main_app_source_change', args=(obj.pk,))
+        return mark_safe(f'<a href="{change_url}">{obj.pk}</a>')
 
 
 class InstitutionIdentifierInline(admin.TabularInline):
@@ -12,10 +26,16 @@ class InstitutionIdentifierInline(admin.TabularInline):
 
 @admin.register(Institution)
 class InstitutionAdmin(BaseModelAdmin):
-    list_display = ("name", "siglum", "get_city_region", "country")
+    list_display = ("name", "siglum", "get_city_region", "country", "is_private_collector")
     search_fields = ("name", "siglum", "city", "region", "alternate_names")
-    list_filter = ("city",)
-    inlines = (InstitutionIdentifierInline,)
+    list_filter = ("is_private_collector", "city")
+    inlines = (InstitutionIdentifierInline, InstitutionSourceInline)
+    fieldsets = [
+        (None, {"fields": ("name", "city", "region", "country", "alternate_names",
+                           "former_sigla", "private_notes")}),
+        ("Private Collector", {"fields": ["is_private_collector"]}),
+        ("Holding Institution", {"fields": ["siglum"]})
+    ]
 
     def get_city_region(self, obj) -> str:
         city: str = obj.city if obj.city else "[No city]"

django/cantusdb_project/main_app/admin/source.py

@@ -1,19 +1,34 @@
 from django.contrib import admin
 
 from main_app.admin.base_admin import BaseModelAdmin, EXCLUDE, READ_ONLY
+from main_app.admin.filters import InputFilter
 from main_app.forms import AdminSourceForm
 from main_app.models import Source
 
 
+class SourceKeyFilter(InputFilter):
+    parameter_name = "holding_institution__siglum"
+    title = "Institution Siglum"
+
+    def queryset(self, request, queryset):
+        if self.value():
+            return queryset.filter(holding_institution__siglum__icontains=self.value())
+
+
 @admin.register(Source)
 class SourceAdmin(BaseModelAdmin):
     exclude = EXCLUDE + ("source_status",)
+    raw_id_fields = ("holding_institution",)
 
     # These search fields are also available on the user-source inline relationship in the user admin page
     search_fields = (
         "siglum",
         "title",
+        "shelfmark",
+        "holding_institution__siglum",
+        "holding_institution__name",
         "id",
+        "provenance_notes"
     )
     readonly_fields = READ_ONLY + (
         "number_of_chants",
@@ -36,19 +51,27 @@ class SourceAdmin(BaseModelAdmin):
     )
 
     list_display = (
-        "title",
-        "siglum",
+        "shelfmark",
+        # "title",
+        "holding_institution",
+        # "siglum",
         "id",
     )
 
     list_filter = (
+        SourceKeyFilter,
         "full_source",
         "segment",
         "source_status",
         "published",
         "century",
+        "holding_institution__is_private_collector",
     )
 
     ordering = ("siglum",)
 
     form = AdminSourceForm
+
+    def get_queryset(self, request):
+        queryset = super().get_queryset(request)
+        return queryset.select_related("holding_institution")

django/cantusdb_project/main_app/forms.py

@@ -172,8 +172,10 @@ class SourceCreateForm(forms.ModelForm):
     class Meta:
         model = Source
         fields = [
-            "title",
-            "siglum",
+            # "title",
+            # "siglum",
+            "holding_institution",
+            "shelfmark",
             "provenance",
             "provenance_notes",
             "full_source",
@@ -196,8 +198,10 @@ class Meta:
             "indexing_notes",
         ]
         widgets = {
-            "title": TextInputWidget(),
-            "siglum": TextInputWidget(),
+            # "title": TextInputWidget(),
+            # "siglum": TextInputWidget(),
+            "holding_institution": autocomplete.ModelSelect2(url="holding-autocomplete"),
+            "shelfmark": TextInputWidget(),
             "provenance": autocomplete.ModelSelect2(url="provenance-autocomplete"),
             "provenance_notes": TextInputWidget(),
             "date": TextInputWidget(),
@@ -355,8 +359,10 @@ class SourceEditForm(forms.ModelForm):
     class Meta:
         model = Source
         fields = [
-            "title",
-            "siglum",
+            # "title",
+            # "siglum",
+            "holding_institution",
+            "shelfmark",
             "provenance",
             "provenance_notes",
             "full_source",
@@ -380,8 +386,8 @@ class Meta:
             "other_editors",
         ]
         widgets = {
-            "title": TextInputWidget(),
-            "siglum": TextInputWidget(),
+            "holding_institution": autocomplete.ModelSelect2(url="holding-autocomplete"),
+            "shelfmark": TextInputWidget(),
             "provenance": autocomplete.ModelSelect2(url="provenance-autocomplete"),
             "provenance_notes": TextInputWidget(),
             "date": TextInputWidget(),