Merge staging into production, 6 March 2025

django/cantusdb_project/main_app/admin/base_admin.py

@@ -1,3 +1,5 @@
+from typing import Tuple
+
 from reversion.admin import VersionAdmin
 
 
@@ -15,7 +17,7 @@
 
 class BaseModelAdmin(VersionAdmin):
     exclude = EXCLUDE
-    readonly_fields = READ_ONLY
+    readonly_fields: Tuple[str, ...] = 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

django/cantusdb_project/main_app/admin/source.py

@@ -62,6 +62,7 @@ class SourceAdmin(BaseModelAdmin):
         "inventoried_by",
         "full_text_entered_by",
         "melodies_entered_by",
+        "description_entered_by",
         "proofreaders",
         "other_editors",
     )

django/cantusdb_project/main_app/forms.py

@@ -32,6 +32,7 @@
     VolpianoAreaWidget,
     SelectWidget,
     CheckboxWidget,
+    MarkdownWidget,
 )
 
 # ModelForm allows to build a form directly from a model
@@ -213,7 +214,7 @@ class Meta:
         help_text="Binding order",
     )
 
-    c_sequence = forms.CharField(
+    c_sequence = forms.IntegerField(
         required=True,
         widget=TextInputWidget,
         help_text="Each folio starts with '1'.",
@@ -279,6 +280,7 @@ class Meta:
             "melodies_entered_by",
             "inventoried_by",
             "full_text_entered_by",
+            "description_entered_by",
             "proofreaders",
             "other_editors",
             "complete_inventory",
@@ -305,8 +307,8 @@ class Meta:
             "date": TextInputWidget(),
             "cursus": SelectWidget(),
             "summary": TextAreaWidget(),
-            "description": TextAreaWidget(),
-            "selected_bibliography": TextAreaWidget(),
+            "description": MarkdownWidget(),
+            "selected_bibliography": MarkdownWidget(),
             "image_link": TextInputWidget(),
             "fragmentarium_id": TextInputWidget(),
             "dact_id": TextInputWidget(),
@@ -324,6 +326,9 @@ class Meta:
             "full_text_entered_by": autocomplete.ModelSelect2Multiple(
                 url="all-users-autocomplete"
             ),
+            "description_entered_by": autocomplete.ModelSelect2Multiple(
+                url="all-users-autocomplete"
+            ),
             "proofreaders": autocomplete.ModelSelect2Multiple(
                 url="all-users-autocomplete"
             ),
@@ -436,7 +441,7 @@ class Meta:
         help_text="Binding order",
     )
 
-    c_sequence = forms.CharField(
+    c_sequence = forms.IntegerField(
         required=True,
         widget=TextInputWidget,
         help_text="Each folio starts with '1'.",
@@ -517,6 +522,7 @@ class Meta:
             "melodies_entered_by",
             "inventoried_by",
             "full_text_entered_by",
+            "description_entered_by",
             "proofreaders",
             "other_editors",
             "production_method",
@@ -535,8 +541,8 @@ class Meta:
             "cursus": SelectWidget(),
             "summary": TextAreaWidget(),
             "liturgical_occasions": TextAreaWidget(),
-            "description": TextAreaWidget(),
-            "selected_bibliography": TextAreaWidget(),
+            "description": MarkdownWidget(),
+            "selected_bibliography": MarkdownWidget(),
             "image_link": TextInputWidget(),
             "fragmentarium_id": TextInputWidget(),
             "dact_id": TextInputWidget(),
@@ -554,6 +560,9 @@ class Meta:
             "full_text_entered_by": autocomplete.ModelSelect2Multiple(
                 url="all-users-autocomplete"
             ),
+            "description_entered_by": autocomplete.ModelSelect2Multiple(
+                url="all-users-autocomplete"
+            ),
             "proofreaders": autocomplete.ModelSelect2Multiple(
                 url="all-users-autocomplete"
             ),
@@ -891,6 +900,14 @@ class Meta:
         ),
     )
 
+    description_entered_by = forms.ModelMultipleChoiceField(
+        queryset=get_user_model().objects.all().order_by("full_name"),
+        required=False,
+        widget=FilteredSelectMultiple(
+            verbose_name="description entered by", is_stacked=False
+        ),
+    )
+
     melodies_entered_by = forms.ModelMultipleChoiceField(
         queryset=get_user_model().objects.all().order_by("full_name"),
         required=False,
@@ -967,3 +984,55 @@ def save(self, source: Source) -> None:
         for folio, image_link in cleaned_data.items():
             if image_link != "":
                 source.chant_set.filter(folio=folio).update(image_link=image_link)
+
+class BrowseChantsBulkEditForm(forms.ModelForm):
+    class Meta:
+        model = Chant
+        fields = [
+            "id",
+            "folio",
+            "c_sequence",
+            "manuscript_full_text_std_spelling",
+            "feast",
+            "service",
+            "genre",
+            "position",
+            "cantus_id",
+            "mode",
+        ]
+        widgets = {
+            "id": HiddenInput(),
+            "feast": autocomplete.ModelSelect2(url="feast-autocomplete"),
+            "service": autocomplete.ModelSelect2(url="service-autocomplete"),
+            "genre": autocomplete.ModelSelect2(url="genre-autocomplete"),
+            "position": TextInputWidget(),
+            "cantus_id": TextInputWidget(),
+            "mode": TextInputWidget(),
+        }
+
+    folio = forms.CharField(
+        required=True,
+        widget=TextInputWidget,
+    )
+
+    c_sequence = forms.IntegerField(
+        required=True,
+        widget=TextInputWidget,
+    )
+
+    manuscript_full_text_std_spelling = CantusDBLatinField(
+        widget=TextAreaWidget,
+        required=True,
+    )
+
+
+BrowseChantsBulkEditFormset = forms.inlineformset_factory(
+    Source,
+    Chant,
+    form=BrowseChantsBulkEditForm,
+    extra=0,
+    max_num=100,
+    can_delete=False,
+    can_order=False,
+    edit_only=True,
+)

django/cantusdb_project/main_app/management/commands/map_source_segments.py

@@ -0,0 +1,19 @@
+from typing import Any
+
+from django.core.management.base import BaseCommand
+from main_app.models import Source
+
+
+class Command(BaseCommand):
+    help = "Make changes to the Source model"
+
+    def handle(self, *args: Any, **kwargs: Any) -> None:
+
+        sources = Source.objects.all()
+        for source in sources:
+            source.segment_m2m.add(source.segment)
+            source.save()
+
+        self.stdout.write(
+            self.style.SUCCESS("Successfully updated Source model with segments")
+        )

django/cantusdb_project/main_app/management/commands/populate_canadian_chant_db.py

@@ -0,0 +1,12 @@
+from typing import Any
+from django.core.management.base import BaseCommand
+from main_app.models import Source, Segment
+
+
+class Command(BaseCommand):
+    def handle(self, *args: Any, **options: Any) -> None:
+        ccdb_segment = Segment.objects.get(name="Canadian Chant Database")
+        canadian_sources = Source.objects.filter(holding_institution__country="Canada")
+        for source in canadian_sources:
+            source.segment_m2m.add(ccdb_segment)
+            source.save()

django/cantusdb_project/main_app/migrations/0035_source_description_entered_by.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.16 on 2025-02-06 17:34
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("main_app", "0034_alter_source_source_completeness"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="source",
+            name="description_entered_by",
+            field=models.ManyToManyField(
+                blank=True,
+                related_name="entered_description_for_sources",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]

django/cantusdb_project/main_app/models/source.py

@@ -106,7 +106,7 @@ class SourceCompletenessChoices(models.IntegerChoices):
     )
 
     ######
-    # The following five fields have nothing to do with user permissions,
+    # The following six fields have nothing to do with user permissions,
     # instead they give credit to users who are indexers and are displayed
     # on the user detail page as sources the user has contributed to.
     inventoried_by = models.ManyToManyField(
@@ -118,6 +118,9 @@ class SourceCompletenessChoices(models.IntegerChoices):
     melodies_entered_by = models.ManyToManyField(
         get_user_model(), related_name="entered_melody_for_sources", blank=True
     )
+    description_entered_by = models.ManyToManyField(
+        get_user_model(), related_name="entered_description_for_sources", blank=True
+    )
     proofreaders = models.ManyToManyField(
         get_user_model(), related_name="proofread_sources", blank=True
     )

django/cantusdb_project/main_app/templates/browse_chants.html

@@ -1,10 +1,33 @@
 {% extends "base_page_with_side_cards.html" %}
+{% load static %}
 {% block title %}<title>Browse Chants | Cantus Database</title>{% endblock %}
-{% block scripts %}<script src="/static/js/chant_list.js"></script>{% endblock %}
+{% block scripts %}
+    <script src="/static/js/chant_list.js"></script>
+    <script type="text/javascript"
+            src="{% static 'admin/js/vendor/jquery/jquery.js' %}"></script>
+    <link rel="stylesheet"
+          href="{% static 'css/browse_chants_bulk_edit.css' %}" />
+    {{ bulk_edit_formset.media }}
+    {{ user_can_edit_chant|json_script:"data-user-can-edit-chants" }}
+{% endblock %}
 {% block uppersidebar %}
     <div class="search-bar mb-3">{% include "global_search_bar.html" %}</div>
 {% endblock %}
 {% block maincontent %}
+    <!--Display messages -->
+    {% for message in messages %}
+        <div class="alert {{ message.tags }} alert-dismissible" role="alert">
+            <a href="#" class="close" data-bs-dismiss="alert" aria-label="close">×</a>
+            {{ message }}
+        </div>
+    {% endfor %}
+    <!--Display form error message -->
+    {% if bulk_edit_formset.errors %}
+        <div class="alert alert-danger alert-dismissible">
+            <a href="#" class="close" data-bs-dismiss="alert" aria-label="close">×</a>
+            {% for error in bulk_edit_formset.errors %}<div>{{ error }}</div>{% endfor %}
+        </div>
+    {% endif %}
     <h3>Browse Chants</h3>
     <span class="small">Displaying {{ page_obj.start_index }}-{{ page_obj.end_index }} of <b>{{ page_obj.paginator.count }}</b> chants.</span>
     <form method="get">
@@ -18,7 +41,8 @@ <h3>Browse Chants</h3>
                         class="form-control form-control-sm form-select form-select-sm">
                     {% comment %} <option value="">- Any -</option> {% endcomment %}
                     {% for source_obj in sources %}
-                        <option value="{{ source_obj.id }}"{% if source_obj.id == source.id %} selected {% endif %}>{{ source_obj.short_heading }}</option>
+                        <option value="{{ source_obj.id }}"
+                                {% if source_obj.id == source.id %}selected{% endif %}>{{ source_obj.short_heading }}</option>
                     {% endfor %}
                 </select>
             </div>
@@ -85,9 +109,21 @@ <h3>Browse Chants</h3>
             </fieldset>
         {% endif %}
     </form>
+    {% if user_can_edit_chant %}
+        <div class="text-end mb-3">
+            <button id="bulkChantEditToggle" type="button" class="btn btn-sm btn-primary">
+                Bulk Edit Chants
+            </button>
+            <button id="bulkChantEditSubmit"
+                    type="submit"
+                    form="bulkChantEditForm"
+                    class="btn btn-sm btn-dark d-none">Save Changes</button>
+        </div>
+    {% endif %}
     {% with exists_on_cantus_ultimus=source.exists_on_cantus_ultimus %}
         {% if chants %}
-            <table class="table table-responsive table-sm table-bordered small">
+            <table id="chantDisplayTable"
+                   class="table table-responsive table-sm table-bordered small">
                 <thead>
                     <tr>
                         <th scope="col" class="text-wrap" title="Folio">Folio</th>
@@ -164,9 +200,48 @@ <h3>Browse Chants</h3>
                     {% endfor %}
                 </tbody>
             </table>
-            <div class="small">
-                {% include "pagination.html" %}
-            </div>
+            {% if user_can_edit_chant %}
+                <form id="bulkChantEditForm" class="d-none" method="post">
+                    {% csrf_token %}
+                    {{ bulk_edit_formset.management_form }}
+                    <div class="table-responsive">
+                        <table class="table table-sm table-bordered small edit-table">
+                            <thead>
+                                <tr>
+                                    <th scope="col" class="sm-edit-col" title="Folio">Folio</th>
+                                    <th scope="col" class="sm-edit-col" title="Sequence">Seq.</th>
+                                    <th scope="col" class="full-text-edit-col" title="Full text">
+                                        Full text (Standard Spelling)
+                                    </th>
+                                    <th scope="col" class="autocomplete-edit-col" title="Feast">Feast</th>
+                                    <th scope="col" class="autocomplete-edit-col" title="Service">Service</th>
+                                    <th scope="col" class="autocomplete-edit-col" title="Genre">Genre</th>
+                                    <th scope="col" class="sm-edit-col" title="Position">Position</th>
+                                    <th scope="col" class="med-edit-col" title="Cantus ID">CantusID</th>
+                                    <th scope="col" class="sm-edit-col" title="Mode">Mode</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                {% for form in bulk_edit_formset %}
+                                    <tr>
+                                        {{ form.id }}
+                                        <td class="text-wrap text-center">{{ form.folio }}</td>
+                                        <td class="text-wrap text-center">{{ form.c_sequence }}</td>
+                                        <td class="text-wrap">{{ form.manuscript_full_text_std_spelling }}</td>
+                                        <td class="text-wrap text-center">{{ form.feast }}</td>
+                                        <td class="text-wrap text-center">{{ form.service }}</td>
+                                        <td class="text-wrap text-center">{{ form.genre }}</td>
+                                        <td class="text-wrap text-center">{{ form.position }}</td>
+                                        <td class="text-wrap text-center">{{ form.cantus_id }}</td>
+                                        <td class="text-wrap text-center">{{ form.mode }}</td>
+                                    </tr>
+                                {% endfor %}
+                            </tbody>
+                        </table>
+                    </div>
+                </form>
+            {% endif %}
+            <div class="small">{% include "pagination.html" %}</div>
         {% else %}
             No chants found.
         {% endif %}

django/cantusdb_project/main_app/templates/century_detail.html

@@ -1,6 +1,6 @@
 {% extends "single_column_with_search_bar.html" %}
 {% block title %}<title>{{ century.name }} | Cantus Database</title>{% endblock %}
-{% block header %}<h3>{{ century.name }}</h3>{% endblock %}
+{% block heading %}<h3>{{ century.name }}</h3>{% endblock %}
 {% block maincontent %}
     <ul>
         {% for source in sources %}

django/cantusdb_project/main_app/templates/chant_detail.html

@@ -360,7 +360,7 @@ <h4>Melodies</h4>
                             <a href="https://cantus.simssa.ca/manuscript/{{ chant.source.id }}/?folio={{ chant.folio }}&chant={{ chant.c_sequence }}"
                                class="guillemet"
                                target="_blank">
-                                Display facsimile <b>({{ chant.folio }})
+                                Display facsimile <b>({{ chant.folio }})</b>
                             </a>
                         {% elif chant.image_link %}
                             <a href={{ chant.image_link }} class="guillemet" target="_blank">Display facsimile <b>({{ chant.folio }})</b></a>