This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch AIRAVATA-3698--Add-support-for-Python-3.11 in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 13e2d6f6be0115a88b532bfc580ad9243ecb6f9f Merge: f1fb9f19 186a8c18 Author: Marcus Christie <[email protected]> AuthorDate: Tue Sep 26 10:22:09 2023 -0400 Merge branch 'develop' into AIRAVATA-3698--Add-support-for-Python-3.11 .github/workflows/build-and-test.yaml | 2 +- .readthedocs.yaml | 8 +- README.md | 3 + django_airavata/apps/auth/package.json | 9 +- django_airavata/apps/auth/yarn.lock | 501 ++++++++++++++++++++- .../commands/fix_page_revision_content_type.py | 23 + .../base/management/commands/load_cms_data.py | 5 +- .../management/commands/load_cybergateway_data.py | 25 - .../management/commands/load_default_gateway.py | 25 - .../management/commands/load_hpcgateway_data.py | 25 - .../commands/load_nanoconfinement_data.py | 25 - .../base/management/commands/load_osu_data.py | 25 - .../base/management/commands/load_phasta_data.py | 25 - .../base/management/commands/load_seagrid_data.py | 25 - .../management/commands/load_searching_sra_data.py | 25 - .../base/management/commands/load_simccs_data.py | 25 - .../management/commands/load_simvascular_data.py | 25 - .../base/management/commands/load_siu_data.py | 25 - .../management/commands/load_south_dakota_data.py | 25 - .../base/management/commands/set_wagtail_site.py | 6 +- 20 files changed, 539 insertions(+), 318 deletions(-) diff --cc .github/workflows/build-and-test.yaml index 468cc19e,9e3cc4e3..999c05d7 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@@ -19,10 -19,10 +19,10 @@@ # name: Build and Test - on: [push] + on: [push, pull_request] jobs: build-js: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - name: Use Node.js as specified in .nvmrc diff --cc django_airavata/wagtailapps/base/management/commands/fix_page_revision_content_type.py index 00000000,5cd2d926..3a47aafb mode 000000,100644..100644 --- a/django_airavata/wagtailapps/base/management/commands/fix_page_revision_content_type.py +++ b/django_airavata/wagtailapps/base/management/commands/fix_page_revision_content_type.py @@@ -1,0 -1,23 +1,23 @@@ + + import json + + from django.core.management.base import BaseCommand -from wagtail.core.models import PageRevision ++from wagtail.models import PageRevision + + + class Command(BaseCommand): + help = "Fix the content_type id in the page revisions content_type which may be correct due to being imported from a different Django instance" + + def handle(self, **options): + fixed_count = 0 + for pr in PageRevision.objects.all(): + content_json = json.loads(pr.content_json) + if content_json['content_type'] != pr.page.content_type.id: + content_json['content_type'] = pr.page.content_type.id + pr.content_json = json.dumps(content_json) + pr.save() + fixed_count = fixed_count + 1 + if fixed_count > 0: + self.stdout.write( + self.style.SUCCESS(f"Successfully fixed the content type of {fixed_count} page revisions") + )
