diff --git a/.github/workflows/hypha-ci.yml b/.github/workflows/hypha-ci.yml index 16e3bbed06..8462db9885 100644 --- a/.github/workflows/hypha-ci.yml +++ b/.github/workflows/hypha-ci.yml @@ -80,7 +80,7 @@ jobs: .venv/bin/python manage.py makemigrations --dry-run --verbosity=3 .venv/bin/python manage.py makemigrations --check - - name: Run django checks + - name: Run django collectstatic if: matrix.group == 2 run: | .venv/bin/python manage.py collectstatic --noinput --no-post-process --verbosity=1 diff --git a/docs/setup/deployment/production/stand-alone.md b/docs/setup/deployment/production/stand-alone.md index bd14b24689..93865305a7 100644 --- a/docs/setup/deployment/production/stand-alone.md +++ b/docs/setup/deployment/production/stand-alone.md @@ -257,9 +257,6 @@ SERVER_EMAIL: app@example.org ANYMAIL_WEBHOOK_SECRET: [KEY] AWS_ACCESS_KEY_ID: [KEY] AWS_DEFAULT_ACL: None -AWS_MIGRATION_ACCESS_KEY_ID: [KEY] -AWS_MIGRATION_BUCKET_NAME: backup.example.org -AWS_MIGRATION_SECRET_ACCESS_KEY: [KEY] AWS_PRIVATE_BUCKET_NAME: private.example.org AWS_PUBLIC_BUCKET_NAME: public.example.org AWS_PUBLIC_CUSTOM_DOMAIN: public.example.org diff --git a/hypha/apply/apps.py b/hypha/apply/apps.py new file mode 100644 index 0000000000..c3a231fed0 --- /dev/null +++ b/hypha/apply/apps.py @@ -0,0 +1,6 @@ +from wagtail.users.apps import WagtailUsersAppConfig + + +class CustomUsersAppConfig(WagtailUsersAppConfig): + user_viewset = "hypha.apply.users.admin_views.CustomUserViewSet" + group_viewset = "hypha.apply.users.admin_views.CustomGroupViewSet" diff --git a/hypha/apply/determinations/models.py b/hypha/apply/determinations/models.py index 4803f15f79..0c8cad47f9 100644 --- a/hypha/apply/determinations/models.py +++ b/hypha/apply/determinations/models.py @@ -51,7 +51,6 @@ class Meta: form_fields = StreamField( DeterminationCustomFormFieldsBlock(), default=[], - use_json_field=True, ) @property diff --git a/hypha/apply/funds/models/forms.py b/hypha/apply/funds/models/forms.py index a0d8c36b5b..721396c231 100644 --- a/hypha/apply/funds/models/forms.py +++ b/hypha/apply/funds/models/forms.py @@ -13,7 +13,7 @@ class ApplicationForm(models.Model): wagtail_reference_index_ignore = True name = models.CharField(max_length=255) - form_fields = StreamField(ApplicationCustomFormFieldsBlock(), use_json_field=True) + form_fields = StreamField(ApplicationCustomFormFieldsBlock()) panels = [ FieldPanel("name"), diff --git a/hypha/apply/funds/models/submissions.py b/hypha/apply/funds/models/submissions.py index f1215be4f5..3541926343 100644 --- a/hypha/apply/funds/models/submissions.py +++ b/hypha/apply/funds/models/submissions.py @@ -439,7 +439,7 @@ class ApplicationSubmission( metaclass=ApplicationSubmissionMetaclass, ): form_data = models.JSONField(encoder=StreamFieldDataEncoder) - form_fields = StreamField(ApplicationCustomFormFieldsBlock(), use_json_field=True) + form_fields = StreamField(ApplicationCustomFormFieldsBlock()) public_id = models.CharField( max_length=255, null=True, blank=True, unique=True, db_index=True ) diff --git a/hypha/apply/funds/templates/funds/admin/parent_chooser.html b/hypha/apply/funds/templates/funds/admin/parent_chooser.html index 61ae59e65a..3b30146b74 100644 --- a/hypha/apply/funds/templates/funds/admin/parent_chooser.html +++ b/hypha/apply/funds/templates/funds/admin/parent_chooser.html @@ -21,7 +21,9 @@

{% blocktrans %}Choose a Fund{% endblocktrans %}

{% csrf_token %}