From d9dda80bbc2fac7b3593dd1b2625bb2b16ed4e34 Mon Sep 17 00:00:00 2001 From: Jay Varner Date: Mon, 25 Sep 2023 16:59:06 -0400 Subject: [PATCH] Update Wagtail --- .../migrations/0010_auto_20230925_2040.py | 23 +++++++++++++++ .../0024_alter_collection_metadata.py | 18 ++++++++++++ .../0056_alter_manifest_metadata.py | 18 ++++++++++++ .../migrations/0037_auto_20230925_2040.py | 28 +++++++++++++++++++ .../migrations/0011_auto_20230925_2040.py | 23 +++++++++++++++ apps/templates/cms/content_page.html | 2 +- apps/templates/page.html | 3 +- config/settings/base.py | 2 ++ requirements/base.txt | 8 +++--- 9 files changed, 119 insertions(+), 6 deletions(-) create mode 100644 apps/iiif/annotations/migrations/0010_auto_20230925_2040.py create mode 100644 apps/iiif/kollections/migrations/0024_alter_collection_metadata.py create mode 100644 apps/iiif/manifests/migrations/0056_alter_manifest_metadata.py create mode 100644 apps/ingest/migrations/0037_auto_20230925_2040.py create mode 100644 apps/readux/migrations/0011_auto_20230925_2040.py diff --git a/apps/iiif/annotations/migrations/0010_auto_20230925_2040.py b/apps/iiif/annotations/migrations/0010_auto_20230925_2040.py new file mode 100644 index 000000000..f071f2fb9 --- /dev/null +++ b/apps/iiif/annotations/migrations/0010_auto_20230925_2040.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.15 on 2023-09-25 20:40 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('annotations', '0009_auto_20220607_1453'), + ] + + operations = [ + migrations.AlterField( + model_name='annotation', + name='oa_annotation', + field=models.JSONField(default=dict), + ), + migrations.AlterField( + model_name='annotation', + name='purpose', + field=models.CharField(choices=[('AS', 'Assessing'), ('BM', 'Bookmarking'), ('CL', 'Classifying'), ('CM', 'Commenting'), ('DS', 'Describing'), ('ED', 'Editing'), ('HL', 'Highlighting'), ('ID', 'Identifying'), ('LK', 'Linking'), ('MO', 'Moderating'), ('PT', 'Painting'), ('QT', 'Questioning'), ('RE', 'Replying'), ('SP', 'Supplementing'), ('TG', 'Tagging')], default='SP', max_length=2), + ), + ] diff --git a/apps/iiif/kollections/migrations/0024_alter_collection_metadata.py b/apps/iiif/kollections/migrations/0024_alter_collection_metadata.py new file mode 100644 index 000000000..05ee2f02e --- /dev/null +++ b/apps/iiif/kollections/migrations/0024_alter_collection_metadata.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.15 on 2023-09-25 20:40 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('kollections', '0023_auto_20220607_1453'), + ] + + operations = [ + migrations.AlterField( + model_name='collection', + name='metadata', + field=models.JSONField(null=True), + ), + ] diff --git a/apps/iiif/manifests/migrations/0056_alter_manifest_metadata.py b/apps/iiif/manifests/migrations/0056_alter_manifest_metadata.py new file mode 100644 index 000000000..3a4d104dd --- /dev/null +++ b/apps/iiif/manifests/migrations/0056_alter_manifest_metadata.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.15 on 2023-09-25 20:40 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('manifests', '0055_alter_manifest_logo_url'), + ] + + operations = [ + migrations.AlterField( + model_name='manifest', + name='metadata', + field=models.JSONField(blank=True, default=dict), + ), + ] diff --git a/apps/ingest/migrations/0037_auto_20230925_2040.py b/apps/ingest/migrations/0037_auto_20230925_2040.py new file mode 100644 index 000000000..fb80acad3 --- /dev/null +++ b/apps/ingest/migrations/0037_auto_20230925_2040.py @@ -0,0 +1,28 @@ +# Generated by Django 3.2.15 on 2023-09-25 20:40 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ingest', '0036_alter_s3ingest_metadata_spreadsheet'), + ] + + operations = [ + migrations.AlterField( + model_name='local', + name='metadata', + field=models.JSONField(blank=True, default=dict), + ), + migrations.AlterField( + model_name='remote', + name='metadata', + field=models.JSONField(blank=True, default=dict), + ), + migrations.AlterField( + model_name='s3ingest', + name='s3_bucket', + field=models.CharField(help_text="The name of a publicly-accessible S3 bucket containing volumes to\n ingest, either at the bucket root or within subfolder(s). Each volume should have its own\n subfolder, with the volume's PID as its name.\n
\n Example: if the bucket's URL is\n https://my-bucket.s3.us-east-1.amazonaws.com/, its name is my-bucket.", max_length=255), + ), + ] diff --git a/apps/readux/migrations/0011_auto_20230925_2040.py b/apps/readux/migrations/0011_auto_20230925_2040.py new file mode 100644 index 000000000..9b665331b --- /dev/null +++ b/apps/readux/migrations/0011_auto_20230925_2040.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.15 on 2023-09-25 20:40 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('readux', '0010_auto_20220607_1453'), + ] + + operations = [ + migrations.AlterField( + model_name='userannotation', + name='oa_annotation', + field=models.JSONField(default=dict), + ), + migrations.AlterField( + model_name='userannotation', + name='purpose', + field=models.CharField(choices=[('AS', 'Assessing'), ('BM', 'Bookmarking'), ('CL', 'Classifying'), ('CM', 'Commenting'), ('DS', 'Describing'), ('ED', 'Editing'), ('HL', 'Highlighting'), ('ID', 'Identifying'), ('LK', 'Linking'), ('MO', 'Moderating'), ('PT', 'Painting'), ('QT', 'Questioning'), ('RE', 'Replying'), ('SP', 'Supplementing'), ('TG', 'Tagging')], default='SP', max_length=2), + ), + ] diff --git a/apps/templates/cms/content_page.html b/apps/templates/cms/content_page.html index a9a900b31..2ab391a0a 100644 --- a/apps/templates/cms/content_page.html +++ b/apps/templates/cms/content_page.html @@ -10,5 +10,5 @@

{{ page.title }}

{{page.tagline}}

{% endif %} - {{ page.body }} + {% include_block page.body %} {% endblock %} diff --git a/apps/templates/page.html b/apps/templates/page.html index ebcd27fb5..9df5932b7 100644 --- a/apps/templates/page.html +++ b/apps/templates/page.html @@ -492,7 +492,8 @@

Text

const options = { manifest: 'https://{{ request.META.HTTP_HOST }}/iiif/v3/{{ volume.pid }}/manifest', id: 'rdx-viewer', - token: document.getElementsByName('csrfmiddlewaretoken')[0].value + token: document.getElementsByName('csrfmiddlewaretoken')[0].value, + uiActions: [] }; {% if not user.is_anonymouns %} diff --git a/config/settings/base.py b/config/settings/base.py index 6a315f20c..b54b23dca 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -44,6 +44,7 @@ 'default': env.db('DATABASE_URL', default='postgres:///readux'), } DATABASES['default']['ATOMIC_REQUESTS'] = True +DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' FILE_UPLOAD_HANDLERS = ["django.core.files.uploadhandler.TemporaryFileUploadHandler"] @@ -337,6 +338,7 @@ } WAGTAIL_SITE_NAME = 'Readux' +WAGTAILADMIN_BASE_URL = 'https://localhost' # CORS HEADERS CORS_ORIGIN_ALLOW_ALL = True diff --git a/requirements/base.txt b/requirements/base.txt index 9641da864..837b4e6fb 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -43,10 +43,10 @@ django-sass-processor pylint-django==2.5.3 # Wagtail -wagtail==3.0.3 -wagtailmenus==3.1.7 # CANNOT UPDATE -git+https://github.com/jcmundy/wagtail-autocomplete.git@master#egg=wagtail-autocomplete -#wagtail-autocomplete==0.3.1 +wagtail==4.2.4 +wagtailmenus==3.1.9 +#git+https://github.com/jcmundy/wagtail-autocomplete.git@master#egg=wagtail-autocomplete +wagtail-autocomplete==0.10.0 wagtail-cache==1.0.2 # Import/Export