Merge pull request #439 from eliwaksbaum/3.2

Django 3.2
DDMAL · Jun 1, 2022 · 601c55f · 601c55f
2 parents 8c2ce24 + 1d82875
commit 601c55f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/app/public/cantusdata/models/manuscript.py b/app/public/cantusdata/models/manuscript.py
@@ -26,7 +26,7 @@ class Meta:
     is_mapped = models.BooleanField(default=False)
     chants_loaded = models.BooleanField(default=False)
     plugins = models.ManyToManyField(
-        "cantusdata.Plugin", related_name="plugins", blank=True, null=True
+        "cantusdata.Plugin", related_name="plugins", blank=True
     )
 
     cantus_url = models.CharField(max_length=255, blank=True, null=True)

diff --git a/app/public/cantusdata/settings.py b/app/public/cantusdata/settings.py
@@ -151,3 +151,5 @@
 
 # AUTHENTICATION
 MAX_TOKEN_AGE_DAYS = 3
+
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
diff --git a/app/public/cantusdata/templates/admin/map_folios.html b/app/public/cantusdata/templates/admin/map_folios.html
@@ -121,9 +121,9 @@ <h2 class="error-message">{{ error }}</h2>
             {% endif %}
         <td>
             {% if is_mapped %}
-            <a href="/admin/map_folios?manuscript_id={{ m_id }}" class="table-link">Edit map</a>
+            <a href="/admin/map_folios/?manuscript_id={{ m_id }}" class="table-link">Edit map</a>
             {% else %}
-            <a href="/admin/map_folios?manuscript_id={{ m_id }}" class="table-link">Map now</a>
+            <a href="/admin/map_folios/?manuscript_id={{ m_id }}" class="table-link">Map now</a>
             {% endif %}
         </td>
     </tr>

diff --git a/app/public/cantusdata/urls.py b/app/public/cantusdata/urls.py
@@ -23,12 +23,12 @@
 
 urlpatterns = [
     # Admin pages
-    path("admin/", admin.site.urls),
     path(
         "admin/map_folios/",
         staff_member_required(MapFoliosView.as_view()),
         name="map-folios-view",
     ),
+    path("admin/", admin.site.urls),
     # Static pages
     path("", staticpages.homepage, name="homepage"),
     path("about/", staticpages.about, name="about"),

diff --git a/app/public/requirements.txt b/app/public/requirements.txt
@@ -1,14 +1,9 @@
-Django==3.1.13
+Django==3.2
 django-extensions==3.1.0
 djangorestframework==3.12.2
 gunicorn==20.1.0
-lxml==4.6.2 # Barely used
 Markdown==2.6.2
-Pillow==7.1.0 # Barely used
-progressbar2==3.47.0 # Barely used
 psycopg2==2.8.6
 requests==2.20.0
 solrpy==0.9.9
-wheel==0.24.0 # Not sure if necessary
-coverage==4.0.3
-coveralls==1.1 # Not sure if necessary
+coverage==4.0.3