From f103d0abd5e09df801015d11b14980ee7c5e047e Mon Sep 17 00:00:00 2001 From: Marmingen <106428188+Marmingen@users.noreply.github.com> Date: Wed, 22 Feb 2023 19:02:06 +0100 Subject: [PATCH] Mostly Small Updates + Security Bumps | Moore v.3.1.1 (#721) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * urlize links in role descriptions and avoid long links to break the page (#638) * Bump phonenumbers from 8.12.23 to 8.12.47 (#647) Bumps [phonenumbers](https://github.com/daviddrysdale/python-phonenumbers) from 8.12.23 to 8.12.47. - [Release notes](https://github.com/daviddrysdale/python-phonenumbers/releases) - [Commits](https://github.com/daviddrysdale/python-phonenumbers/compare/v8.12.23...v8.12.47) --- updated-dependencies: - dependency-name: phonenumbers dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * More event bugfixes (#640) * Fixes - Make it clearer when users haven't recieved a ticket for an event - Order participants by email. - Make sure instances are saved when 'ready_to_pay' is pressed. * Lint fixes * More lint fixes Co-authored-by: Johan Andersson Östling * Bump psycopg2 from 2.8.6 to 2.9.3 (#610) Bumps [psycopg2](https://github.com/psycopg/psycopg2) from 2.8.6 to 2.9.3. - [Release notes](https://github.com/psycopg/psycopg2/releases) - [Changelog](https://github.com/psycopg/psycopg2/blob/master/NEWS) - [Commits](https://github.com/psycopg/psycopg2/commits) --- updated-dependencies: - dependency-name: psycopg2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling * Bump wagtailmedia from 0.7.0 to 0.9.0 (#639) Bumps [wagtailmedia](https://github.com/torchbox/wagtailmedia) from 0.7.0 to 0.9.0. - [Release notes](https://github.com/torchbox/wagtailmedia/releases) - [Changelog](https://github.com/torchbox/wagtailmedia/blob/main/CHANGELOG.md) - [Commits](https://github.com/torchbox/wagtailmedia/compare/v0.7.0...v0.9.0) --- updated-dependencies: - dependency-name: wagtailmedia dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling * change list display for applications and positions (#573) * change list display for applications * fixed position list display Co-authored-by: Johan Andersson Östling * Bump requests from 2.25.1 to 2.27.1 (#652) Bumps [requests](https://github.com/psf/requests) from 2.25.1 to 2.27.1. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](https://github.com/psf/requests/compare/v2.25.1...v2.27.1) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump rules from 3.0 to 3.3 (#651) Bumps [rules](https://github.com/dfunckt/django-rules) from 3.0 to 3.3. - [Release notes](https://github.com/dfunckt/django-rules/releases) - [Changelog](https://github.com/dfunckt/django-rules/blob/master/CHANGELOG.md) - [Commits](https://github.com/dfunckt/django-rules/compare/v3.0.0...v3.3.0) --- updated-dependencies: - dependency-name: rules dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling * Bump djangorestframework from 3.12.4 to 3.13.1 (#653) Bumps [djangorestframework](https://github.com/encode/django-rest-framework) from 3.12.4 to 3.13.1. - [Release notes](https://github.com/encode/django-rest-framework/releases) - [Commits](https://github.com/encode/django-rest-framework/compare/3.12.4...3.13.1) --- updated-dependencies: - dependency-name: djangorestframework dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling * Bump django-libsass from 0.8 to 0.9 (#654) Bumps [django-libsass](https://github.com/torchbox/django-libsass) from 0.8 to 0.9. - [Release notes](https://github.com/torchbox/django-libsass/releases) - [Changelog](https://github.com/torchbox/django-libsass/blob/main/CHANGELOG.txt) - [Commits](https://github.com/torchbox/django-libsass/compare/v0.8...v0.9) --- updated-dependencies: - dependency-name: django-libsass dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling * Bump phonenumbers from 8.12.47 to 8.12.48 (#656) Bumps [phonenumbers](https://github.com/daviddrysdale/python-phonenumbers) from 8.12.47 to 8.12.48. - [Release notes](https://github.com/daviddrysdale/python-phonenumbers/releases) - [Commits](https://github.com/daviddrysdale/python-phonenumbers/compare/v8.12.47...v8.12.48) --- updated-dependencies: - dependency-name: phonenumbers dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump sentry-sdk from 1.1.0 to 1.5.11 (#655) Bumps [sentry-sdk](https://github.com/getsentry/sentry-python) from 1.1.0 to 1.5.11. - [Release notes](https://github.com/getsentry/sentry-python/releases) - [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-python/compare/1.1.0...1.5.11) --- updated-dependencies: - dependency-name: sentry-sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling * Feat/gdpr button (#687) * #649 Added html for gdpr button * #649 Added field for gdpr button * Added text and link for GDPR field * Added translation for GDPR * Flake8 now works * mellanslag Co-authored-by: Einar Johansson Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Update CHANGELOG.md * Changelog updated * Update README.md * Update README.md * Update README.md * remove login notice (#714) * update wagtail to 2.13.5 (#717) * Update django to 3.2.17 (#716) * Update requirements.txt * change django to 3.2.17 --------- Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Bump phonenumbers from 8.12.48 to 8.13.6 (#718) Bumps [phonenumbers](https://github.com/daviddrysdale/python-phonenumbers) from 8.12.48 to 8.13.6. - [Release notes](https://github.com/daviddrysdale/python-phonenumbers/releases) - [Commits](https://github.com/daviddrysdale/python-phonenumbers/compare/v8.12.48...v8.13.6) --- updated-dependencies: - dependency-name: phonenumbers dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Update README.md * Use python decouple for environment variables (#715) * use python decouple for env variables * remove old staging settings * Make melos env variables not required in tests * Flake8 * Flake8 - Flake8 --------- Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Bump psycopg2 from 2.9.3 to 2.9.5 (#725) Bumps [psycopg2](https://github.com/psycopg/psycopg2) from 2.9.3 to 2.9.5. - [Release notes](https://github.com/psycopg/psycopg2/releases) - [Changelog](https://github.com/psycopg/psycopg2/blob/master/NEWS) - [Commits](https://github.com/psycopg/psycopg2/commits) --- updated-dependencies: - dependency-name: psycopg2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix/security (#722) * Merge dev -> fix (#708) * Update CHANGELOG.md * Changelog updated * Update README.md * Update README.md * Update README.md * Update instagram_feed_chooser_block.py ugettext_lazy is deprecated and Unicode is now incorporated into gettext_lazy * Update instagram_tags.py ugettext_lazy is deprecated and Unicode is now incorporated into gettext_lazy * Update views.py ugettext_lazy is deprecated and Unicode is now incorporated into gettext_lazy * Update wagtail_hooks.py ugettext_lazy is deprecated and Unicode is now incorporated into gettext_lazy * Update data_migrations.py stream_data is deprecated since wagtail 2.12, replaced with raw_data (OBS, better solution is to increment the base StreamField as a list, but this needs more consideration) Make sure to update wagtail to > 2.12 in this patch * Updated deprecated force_text --------- Co-authored-by: Robin Dymér * Update gitignore with official github gitignore (#731) * Translation of the gdpr-button (#696) * #649 Added html for gdpr button * #649 Added field for gdpr button * Added text and link for GDPR field * Added translation for GDPR * Flake8 now works * mellanslag * failed * Fixed faultytranslation * Flake8 * Update django.po --------- Co-authored-by: Einar Johansson Co-authored-by: plastpase123 Co-authored-by: Marmingen * Update README.md * Bump wagtail from 2.13 to 2.16.2 (#646) Bumps [wagtail](https://github.com/wagtail/wagtail) from 2.13 to 2.16.2. - [Release notes](https://github.com/wagtail/wagtail/releases) - [Changelog](https://github.com/wagtail/wagtail/blob/main/CHANGELOG.txt) - [Commits](https://github.com/wagtail/wagtail/compare/v2.13...v2.16.2) --- updated-dependencies: - dependency-name: wagtail dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Bump sentry-sdk from 1.5.11 to 1.15.0 (#710) Bumps [sentry-sdk](https://github.com/getsentry/sentry-python) from 1.5.11 to 1.15.0. - [Release notes](https://github.com/getsentry/sentry-python/releases) - [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-python/compare/1.5.11...1.15.0) --- updated-dependencies: - dependency-name: sentry-sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Ignore .mo files from git (#735) * delete and ignore .mo * update readme with create translations * added translations to docker installation --------- Co-authored-by: Marmingen * Bump requests from 2.27.1 to 2.28.2 (#733) Bumps [requests](https://github.com/psf/requests) from 2.27.1 to 2.28.2. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](https://github.com/psf/requests/compare/v2.27.1...v2.28.2) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Fix/unassign unpaid tickets (#738) * Fixed bug * Bring branch up to date (#737) * Minor changes and GDPR-button feature (#689) * urlize links in role descriptions and avoid long links to break the page (#638) * Bump phonenumbers from 8.12.23 to 8.12.47 (#647) Bumps [phonenumbers](https://github.com/daviddrysdale/python-phonenumbers) from 8.12.23 to 8.12.47. - [Release notes](https://github.com/daviddrysdale/python-phonenumbers/releases) - [Commits](https://github.com/daviddrysdale/python-phonenumbers/compare/v8.12.23...v8.12.47) --- updated-dependencies: - dependency-name: phonenumbers dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * More event bugfixes (#640) * Fixes - Make it clearer when users haven't recieved a ticket for an event - Order participants by email. - Make sure instances are saved when 'ready_to_pay' is pressed. * Lint fixes * More lint fixes Co-authored-by: Johan Andersson Östling * Bump psycopg2 from 2.8.6 to 2.9.3 (#610) Bumps [psycopg2](https://github.com/psycopg/psycopg2) from 2.8.6 to 2.9.3. - [Release notes](https://github.com/psycopg/psycopg2/releases) - [Changelog](https://github.com/psycopg/psycopg2/blob/master/NEWS) - [Commits](https://github.com/psycopg/psycopg2/commits) --- updated-dependencies: - dependency-name: psycopg2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling * Bump wagtailmedia from 0.7.0 to 0.9.0 (#639) Bumps [wagtailmedia](https://github.com/torchbox/wagtailmedia) from 0.7.0 to 0.9.0. - [Release notes](https://github.com/torchbox/wagtailmedia/releases) - [Changelog](https://github.com/torchbox/wagtailmedia/blob/main/CHANGELOG.md) - [Commits](https://github.com/torchbox/wagtailmedia/compare/v0.7.0...v0.9.0) --- updated-dependencies: - dependency-name: wagtailmedia dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling * change list display for applications and positions (#573) * change list display for applications * fixed position list display Co-authored-by: Johan Andersson Östling * Bump requests from 2.25.1 to 2.27.1 (#652) Bumps [requests](https://github.com/psf/requests) from 2.25.1 to 2.27.1. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](https://github.com/psf/requests/compare/v2.25.1...v2.27.1) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump rules from 3.0 to 3.3 (#651) Bumps [rules](https://github.com/dfunckt/django-rules) from 3.0 to 3.3. - [Release notes](https://github.com/dfunckt/django-rules/releases) - [Changelog](https://github.com/dfunckt/django-rules/blob/master/CHANGELOG.md) - [Commits](https://github.com/dfunckt/django-rules/compare/v3.0.0...v3.3.0) --- updated-dependencies: - dependency-name: rules dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling * Bump djangorestframework from 3.12.4 to 3.13.1 (#653) Bumps [djangorestframework](https://github.com/encode/django-rest-framework) from 3.12.4 to 3.13.1. - [Release notes](https://github.com/encode/django-rest-framework/releases) - [Commits](https://github.com/encode/django-rest-framework/compare/3.12.4...3.13.1) --- updated-dependencies: - dependency-name: djangorestframework dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling * Bump django-libsass from 0.8 to 0.9 (#654) Bumps [django-libsass](https://github.com/torchbox/django-libsass) from 0.8 to 0.9. - [Release notes](https://github.com/torchbox/django-libsass/releases) - [Changelog](https://github.com/torchbox/django-libsass/blob/main/CHANGELOG.txt) - [Commits](https://github.com/torchbox/django-libsass/compare/v0.8...v0.9) --- updated-dependencies: - dependency-name: django-libsass dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling * Bump phonenumbers from 8.12.47 to 8.12.48 (#656) Bumps [phonenumbers](https://github.com/daviddrysdale/python-phonenumbers) from 8.12.47 to 8.12.48. - [Release notes](https://github.com/daviddrysdale/python-phonenumbers/releases) - [Commits](https://github.com/daviddrysdale/python-phonenumbers/compare/v8.12.47...v8.12.48) --- updated-dependencies: - dependency-name: phonenumbers dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump sentry-sdk from 1.1.0 to 1.5.11 (#655) Bumps [sentry-sdk](https://github.com/getsentry/sentry-python) from 1.1.0 to 1.5.11. - [Release notes](https://github.com/getsentry/sentry-python/releases) - [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-python/compare/1.1.0...1.5.11) --- updated-dependencies: - dependency-name: sentry-sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling * Feat/gdpr button (#687) * #649 Added html for gdpr button * #649 Added field for gdpr button * Added text and link for GDPR field * Added translation for GDPR * Flake8 now works * mellanslag Co-authored-by: Einar Johansson Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Update CHANGELOG.md * Changelog updated * Update README.md Co-authored-by: Daniel Fehrm Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Linus Shoravi <42211142+lshoravi@users.noreply.github.com> Co-authored-by: Johan Andersson Östling Co-authored-by: Plastpase123 <62748997+Plastpase123@users.noreply.github.com> Co-authored-by: Einar Johansson * update wagtail to 2.13.5 (#717) * Update django to 3.2.17 (#716) * Update requirements.txt * change django to 3.2.17 --------- Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Bump phonenumbers from 8.12.48 to 8.13.6 (#718) Bumps [phonenumbers](https://github.com/daviddrysdale/python-phonenumbers) from 8.12.48 to 8.13.6. - [Release notes](https://github.com/daviddrysdale/python-phonenumbers/releases) - [Commits](https://github.com/daviddrysdale/python-phonenumbers/compare/v8.12.48...v8.13.6) --- updated-dependencies: - dependency-name: phonenumbers dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Update README.md * Use python decouple for environment variables (#715) * use python decouple for env variables * remove old staging settings * Make melos env variables not required in tests * Flake8 * Flake8 - Flake8 --------- Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Bump psycopg2 from 2.9.3 to 2.9.5 (#725) Bumps [psycopg2](https://github.com/psycopg/psycopg2) from 2.9.3 to 2.9.5. - [Release notes](https://github.com/psycopg/psycopg2/releases) - [Changelog](https://github.com/psycopg/psycopg2/blob/master/NEWS) - [Commits](https://github.com/psycopg/psycopg2/commits) --- updated-dependencies: - dependency-name: psycopg2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix/security (#722) * Merge dev -> fix (#708) * Update CHANGELOG.md * Changelog updated * Update README.md * Update README.md * Update README.md * Update instagram_feed_chooser_block.py ugettext_lazy is deprecated and Unicode is now incorporated into gettext_lazy * Update instagram_tags.py ugettext_lazy is deprecated and Unicode is now incorporated into gettext_lazy * Update views.py ugettext_lazy is deprecated and Unicode is now incorporated into gettext_lazy * Update wagtail_hooks.py ugettext_lazy is deprecated and Unicode is now incorporated into gettext_lazy * Update data_migrations.py stream_data is deprecated since wagtail 2.12, replaced with raw_data (OBS, better solution is to increment the base StreamField as a list, but this needs more consideration) Make sure to update wagtail to > 2.12 in this patch * Updated deprecated force_text --------- Co-authored-by: Robin Dymér * Update gitignore with official github gitignore (#731) * Translation of the gdpr-button (#696) * #649 Added html for gdpr button * #649 Added field for gdpr button * Added text and link for GDPR field * Added translation for GDPR * Flake8 now works * mellanslag * failed * Fixed faultytranslation * Flake8 * Update django.po --------- Co-authored-by: Einar Johansson Co-authored-by: plastpase123 Co-authored-by: Marmingen * Update README.md * Bump wagtail from 2.13 to 2.16.2 (#646) Bumps [wagtail](https://github.com/wagtail/wagtail) from 2.13 to 2.16.2. - [Release notes](https://github.com/wagtail/wagtail/releases) - [Changelog](https://github.com/wagtail/wagtail/blob/main/CHANGELOG.txt) - [Commits](https://github.com/wagtail/wagtail/compare/v2.13...v2.16.2) --- updated-dependencies: - dependency-name: wagtail dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Johan Andersson Östling Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Bump sentry-sdk from 1.5.11 to 1.15.0 (#710) Bumps [sentry-sdk](https://github.com/getsentry/sentry-python) from 1.5.11 to 1.15.0. - [Release notes](https://github.com/getsentry/sentry-python/releases) - [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-python/compare/1.5.11...1.15.0) --- updated-dependencies: - dependency-name: sentry-sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> * Ignore .mo files from git (#735) * delete and ignore .mo * update readme with create translations * added translations to docker installation --------- Co-authored-by: Marmingen * Bump requests from 2.27.1 to 2.28.2 (#733) Bumps [requests](https://github.com/psf/requests) from 2.27.1 to 2.28.2. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](https://github.com/psf/requests/compare/v2.27.1...v2.28.2) --- updated-dependencies: - dependency-name: requests dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marmingen <106428188+Marmingen@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] Co-authored-by: Daniel Fehrm Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Linus Shoravi <42211142+lshoravi@users.noreply.github.com> Co-authored-by: Johan Andersson Östling Co-authored-by: Plastpase123 <62748997+Plastpase123@users.noreply.github.com> Co-authored-by: Einar Johansson Co-authored-by: Robin Dymér Co-authored-by: plastpase123 Co-authored-by: Marmingen --------- Signed-off-by: dependabot[bot] Co-authored-by: Robin Dymér Co-authored-by: Daniel Fehrm Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Linus Shoravi <42211142+lshoravi@users.noreply.github.com> Co-authored-by: Johan Andersson Östling Co-authored-by: Plastpase123 <62748997+Plastpase123@users.noreply.github.com> Co-authored-by: Einar Johansson Co-authored-by: plastpase123 Co-authored-by: Marmingen * reset checks --------- Signed-off-by: dependabot[bot] Co-authored-by: Daniel Fehrm Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Linus Shoravi <42211142+lshoravi@users.noreply.github.com> Co-authored-by: Johan Andersson Östling Co-authored-by: Plastpase123 <62748997+Plastpase123@users.noreply.github.com> Co-authored-by: Einar Johansson Co-authored-by: Robin Dymér Co-authored-by: plastpase123 Co-authored-by: Marmingen --- .env-normal-template | 18 -- .env-docker-template => .env-template | 0 .gitignore | 154 ++++++++++++++++-- README.md | 72 ++++---- requirements.txt | 16 +- source_me.sh | 4 - src/blocks/locale/sv/LC_MESSAGES/django.mo | Bin 3521 -> 0 bytes src/branding/locale/sv/LC_MESSAGES/django.mo | Bin 1424 -> 0 bytes src/branding/wagtail_hooks.py | 2 +- src/events/views/admin_unassign_unpaid.py | 2 +- src/google/locale/sv/LC_MESSAGES/django.mo | Bin 1135 -> 0 bytes src/home/locale/sv/LC_MESSAGES/django.mo | Bin 1961 -> 0 bytes .../blocks/instagram_feed_chooser_block.py | 2 +- src/instagram/locale/sv/LC_MESSAGES/django.mo | Bin 2143 -> 0 bytes src/instagram/templatetags/instagram_tags.py | 2 +- src/instagram/views.py | 2 +- .../locale/sv/LC_MESSAGES/django.mo | Bin 12091 -> 0 bytes .../locale/sv/LC_MESSAGES/django.po | 33 ++-- .../migrations/0047_auto_20221114_1721.py | 23 +++ src/involvement/models/application.py | 4 +- src/locale/sv/LC_MESSAGES/django.mo | Bin 380 -> 0 bytes src/members/fields.py | 4 +- src/members/locale/sv/LC_MESSAGES/django.mo | Bin 9035 -> 0 bytes src/members/templates/registration/login.html | 2 - src/moore/locale/sv/LC_MESSAGES/django.mo | Bin 1313 -> 0 bytes src/moore/settings/base.py | 38 ++++- src/moore/settings/dev.py | 23 --- src/moore/settings/production.py | 38 +---- src/moore/settings/staging.py | 59 ------- .../static/sass/partials/pages/_all.scss | 1 - .../static/sass/partials/pages/_login.scss | 7 - src/news/locale/sv/LC_MESSAGES/django.mo | Bin 777 -> 0 bytes src/search/locale/sv/LC_MESSAGES/django.mo | Bin 527 -> 0 bytes src/utils/data_migrations.py | 2 +- 34 files changed, 285 insertions(+), 223 deletions(-) delete mode 100644 .env-normal-template rename .env-docker-template => .env-template (100%) delete mode 100644 src/blocks/locale/sv/LC_MESSAGES/django.mo delete mode 100644 src/branding/locale/sv/LC_MESSAGES/django.mo delete mode 100644 src/google/locale/sv/LC_MESSAGES/django.mo delete mode 100644 src/home/locale/sv/LC_MESSAGES/django.mo delete mode 100644 src/instagram/locale/sv/LC_MESSAGES/django.mo delete mode 100644 src/involvement/locale/sv/LC_MESSAGES/django.mo create mode 100644 src/involvement/migrations/0047_auto_20221114_1721.py delete mode 100644 src/locale/sv/LC_MESSAGES/django.mo delete mode 100644 src/members/locale/sv/LC_MESSAGES/django.mo delete mode 100644 src/moore/locale/sv/LC_MESSAGES/django.mo delete mode 100644 src/moore/settings/staging.py delete mode 100644 src/moore/static/sass/partials/pages/_login.scss delete mode 100644 src/news/locale/sv/LC_MESSAGES/django.mo delete mode 100644 src/search/locale/sv/LC_MESSAGES/django.mo diff --git a/.env-normal-template b/.env-normal-template deleted file mode 100644 index 437c2cb9..00000000 --- a/.env-normal-template +++ /dev/null @@ -1,18 +0,0 @@ -# This file is only used in development. Do not use in production. Moore in production gets its variables from elsewhere -# Comment out only the variables that you need. -# export MELOS_URL= -# export MELOS_ORG_ID= -# export MELOS_ADMIN= - -# export GOOGLE_API_KEY= - -# export INSTAGRAM_APP_ID= -# export INSTAGRAM_APP_SECRET= -# export INSTAGRAM_REDIRECT_URL= - -# Database info -# export DJANGO_DB_NAME= -# export DJANGO_DB_USER= -# export DJANGO_DB_PASS= -# export DJANGO_DB_HOST= -# export DJANGO_DB_PORT= diff --git a/.env-docker-template b/.env-template similarity index 100% rename from .env-docker-template rename to .env-template diff --git a/.gitignore b/.gitignore index b31283d2..7b482c2c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,38 +3,172 @@ __pycache__/ *.py[cod] *$py.class +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + # Unit test / coverage reports htmlcov/ .tox/ +.nox/ .coverage .coverage.* .cache nosetests.xml coverage.xml -*,cover +*.cover +*.py,cover .hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot # Django stuff: *.log local_settings.py db.sqlite3 -src/media/ +db.sqlite3-journal -# Compressor -CACHE/ +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/#use-with-ide +.pdm.toml + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid -# virtualenv +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ -# PyCharm project settings +# Compressor +CACHE/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. .idea/ .DS_Store -# ENV -.env -.env-normal - # VSCode .vscode +# Docker data postgres-data/ + +src/media/ +*.log + diff --git a/README.md b/README.md index df126ba6..6979dcff 100644 --- a/README.md +++ b/README.md @@ -8,53 +8,59 @@ applications. Built using [Wagtail](https://wagtail.io/) and the [Django](https: Moore intends to replace obfuscated custom applications. This is why this project keeps a high regard to programming practice and documentation. -Any questions about the project can be send to the [UTN system +Any questions about the project can be sent to the [UTN system administrator](mailto:admin@utn.se). Before contributing please read through our [contribution guidelines](CONTRIBUTING.md). -## Getting Started - Virtual Environment +## Getting Started + +To set up a local version of moore, use **either** Docker or a virtual environment (**recommended**). + +### Using Virtual Environment To get started with Project Moore, follow these instructions to set up a **development** environment: 1. Install Python 3, at least version 3.6 or up. 2. [Install postgresql](INSTALLING_POSTGRES.md) -2. Install the following python packages: - - python3-venv - - python3-dev - - build-essentials - - libpq-dev -3. Clone the repository. -3. Copy the file `.env-normal-template` and name the copy `.env-normal` -3. Fill in the necessary variables in `.env`. `MELOS_URL` and `MELOS_ADMIN` are required. You might have to fill in some database credidentils. Check `src/moore/settings/dev.py` for which default values are used if you don't specify and credidentials. -4. Run `source ./source_me.sh` to create a virtual environment. -4. Run `pip install --upgrade pip` to make sure that pip is running the latest version -5. Run `pip install -r dev-requirements.txt` -6. Use `cd src` to enter the website directory. -7. Run `./manage.py migrate` to initialize the database. -8. Run `./manage.py createsuperuser` to create an admin user. +3. Install the following python packages: + - python3-venv + - python3-dev + - build-essential + - libpq-dev +4. Clone the repository. +5. Copy the file `.env-template` and name the copy `.env` +6. Fill in the necessary variables in `.env`. `MELOS_URL` and `MELOS_ADMIN` are required. You might have to fill in some database credidentils. Check `src/moore/settings/base.py` for which default values are used if you don't specify and credidentials. +7. Run `source ./source_me.sh` to create a virtual environment. +8. Run `pip install --upgrade pip` to make sure that pip is running the latest version +9. Run `pip install -r dev-requirements.txt` +10. Use `cd src` to enter the website directory. +11. Run `./manage.py migrate` to initialize the database. +12. Run `./manage.py compilemessages` to create all the translations. +13. Run `./manage.py createsuperuser` to create an admin user. (if the ssn is not passed, the most likely fault lies with the db-credentials) During development, you can run a test web server using `./manage.py runserver`. **IMPORTANT!** When running any command in moore, you must be in the virtual environment (a.k.a. `source source_me.sh`) -## Getting Started - Docker +### Using Docker -If you can use Docker, there is an alternative way to get your development +If you cannot use a virtual environment, there is an alternative way to get your development environment all set up: 1. Install [docker engine](https://docs.docker.com/engine/install/) 1. Install [docker compose](https://docs.docker.com/compose/install/). -(On Ubuntu you can install `docker-compose` with `sudo apt install docker-compose`) + (On Ubuntu you can install `docker-compose` with `sudo apt install docker-compose`) 1. Clone the repository. -2. Copy `.env-docker-template` to `.env` and fill in the environments. -3. Run `docker-compose up` create and start the docker instance -4. Run `docker exec -it moore python src/manage.py migrate` to initialize the -database -5. Run `docker exec -it moore python src/manage.py createsuperuser` to create an admin -user. +1. Copy `.env-docker-template` to `.env` and fill in the environments. +1. Run `docker-compose up` create and start the docker instance +1. Run `docker exec -it moore python src/manage.py migrate` to initialize the + database +1. Run `docker exec -it moore python src/manage.py compilemessages` to create all the translations +1. Run `docker exec -it moore python src/manage.py createsuperuser` to create an admin + user. The Moore application is now available on `http://localhost:8000` and can be started using `docker-compose up -d` (the `-d` flag starts the instance in the background) and stopped `docker-compose stop`. @@ -76,8 +82,8 @@ These tests are run automatically using Github Actions. If, however, you want to run these tests locally you can run the following commands in the project root directory: -- `./src/manage.py test src` - to test with our Django test suites -- `flake8 src` - to run the flake8 style enforcer +- `./src/manage.py test src` - to test with our Django test suites +- `flake8 src` - to run the flake8 style enforcer ## Translating @@ -85,23 +91,23 @@ Project Moore intends to be multilingual. The web application is available in both Swedish and English. Whenever any translatable text is added or changed it should be translated using translation files. -*Within Project Moore we use American English.* +_Within Project Moore we use American English._ To create translations for an app: 1. `cd src/` 1. `../manage.py makemessages -l sv` -2. This will create or update the files under `src//locale/`. -3. Use poedit (or your favourite tool -- please do not use a plain text editor -since those cannot handle all the subtleties) to fix the translations. -4. `../manage.py compilemessages` +1. This will create or update the files under `src//locale/`. +1. Use [poedit](https://poedit.net/) (or your favourite tool -- please do not use a plain text editor + since those cannot handle all the subtleties) to fix the translations. +1. `../manage.py compilemessages` ## Notes about the materialize framework Project moore uses materialize as a css framework to get pre-built components. The following components have been disabled in the `materialize.scss` file in the materialize app folder: -- `navbar` +- `navbar` The reason for this is that they are not needed and are interfering with the code that we write. Keep this in mind when updating or reinstalling materialize. diff --git a/requirements.txt b/requirements.txt index b175733c..ef0cb583 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,9 @@ -Django[argon2]==3.2.3 -wagtail==2.13 - +Django[argon2]==3.2.17 +wagtail==2.16.2 # External Libraries -requests==2.27.1 +requests==2.28.2 # Templates django-compressor==2.4.1 @@ -19,13 +18,13 @@ rules==3.3 django-simple-email-confirmation==0.70 # Logging -sentry-sdk==1.5.11 +sentry-sdk==1.15.0 # Postgres -psycopg2==2.9.3 +psycopg2==2.9.5 # Phonenumber validation -phonenumbers==8.12.48 +phonenumbers==8.13.6 # Wagtail media module wagtailmedia==0.9.0 @@ -36,3 +35,6 @@ djangorestframework==3.13.1 wagtail-django-recaptcha==1.0 django-jsonschema-form==1.0.3 + +# Improved environment variable handling +python-decouple==3.7 diff --git a/source_me.sh b/source_me.sh index 34cb3a50..dbebec63 100644 --- a/source_me.sh +++ b/source_me.sh @@ -16,7 +16,3 @@ else python3 -m venv venv source venv/bin/activate fi - -if [ -f .env-normal ]; then - source .env-normal -fi diff --git a/src/blocks/locale/sv/LC_MESSAGES/django.mo b/src/blocks/locale/sv/LC_MESSAGES/django.mo deleted file mode 100644 index dff7b7a3770717ecd2a2d0c004241274583091e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3521 zcmb`IO>87b8HS4xSYm!cLLh+zQVu4pS@+nUU82a#N}I8F9c%54u_v1#kWkHZ%}nof zS2z7LwuJ--4u}IH5(05R$^kDIL=HJPhj2l2;KYF(A|ymEph!U|C_;dQK;rqT+iOSR z2Cb=ns=BMHzrT9twR`XUf#SMAdx-XncPX_Fzw&NwT>Ez_br(E@$V$gTIFS)T`WNpWne5_y;KazX>0Oe{0@9#K-BXIVg6_ zbGsKV!Vkg@)NmW-@N1Bt`Xe{l?@v(Hztuedd&7UhHJ;zWB$>C)P3*o7zX-n!#qOUs zd4u)ho^Tw^00e1B!od!H>azLYa3DFX!O>@NW18sNp93JWSvU{7LivHTVGI zH=*R^44aCdb8s29;UnZKg#6UEF;c$sT*DtimZ~2^Oi+gne+Fg#i}3yMWynwcsu}+V z%KP6#+3$5I>;DY-slPV-H~cK)GbBykFG7j$W6k&?lsI*u*u4wIZUes#zYk^p-54S3 z?}PH)2cbNlgYvz3xCYNdnYRxme&2*c_&q4={?Sm9_aVl2L7D$RGkzFKJX%opeGJ|M zFGKNj2R;m+h4;aIsNr|vW%xqFzd-S838!S<6Y%5k1{6OtZXNgyNP5%)O)i=HDcYP2 zxWqQOB)1ZmkJ7~NPtra@`vmP#+JiK)GoT$`nvVGVIof&JJnb_ysTaA#pXT`b@gx3T z*W+3G5wq? zU>2-g8K!%#?%BLhYbGD7wP+HB>~UqntX>|Kw(b_{%6?{CsLN4Q=)(3(tk7ku2UQ&F z%nYsGi^6iGp0p;6+)!=wF-&fS+DPQ}Io-AUwH3#Y(uvJubD%a{KdwT{HleK5gEW8J zcbHI=W|*5q53CIfZE~yoxizH?b>ws>$1+(+zZ_W|+d-)l>#COC80dqv(tYE!OG^y5 zIw}`5cKMh@ZjfHCO4ll^I5V`RHvPUW3bkqSq2F~5O&qy6>_LDp; zw-sCaf-{tq&lHcJ?p~k0{Xz=s9WMvRPDrj*Yz?utNmi04GCGbj9N{GOAEwz`HW;O|1(B-fcu_@D>m7B&5D^6$7wI(?=UeU#5W@}^X%E`x< zTT3&m6gr^`x(68_kz!xWViUQGnz-kMEiXOYy&61zGEcrWuz7IB^;0>aEBf(XRL*S2 zRc_+oYMLj-iguYF7MI!=b=|#m*6G7l$Al48adtGlMde<%VLm+^I}xrO=^!v_ zYkDMtXk!_O9@>Oxo$h%>#5NsT=M3U9u2nHY61^_=IEbOzsSwh!+8B!>a>I;H6o8ST=&5XO-GOWArxG1jRA6cKm`@;u%v#V`DxosGIT6VLLD8n<9IXA*~Si>E~t;(^%5aWEp9(_84F zo}fP(*S&U*{WNW3iE2r*h8R7JqoHP%Po}PQG$#Z6Em2m%DJ31K&FNu5@bVKK)jjg3 zo}3;HeyO}6y;Zp3q- zx)WTiOS#ZH{B2DSOI2rYA~h#IiyQGh!12(=1tu8eaC*zh^7UE} zkFERPH|WSQSkTKp*dnQGm7X5vgisPml)Ria4}BfJ{mqG%$`OjEhY9AE=>F|$9Hm)i Yv_C+;#BnUw{z!9p9ba%KC!9e42N`mf!~g&Q diff --git a/src/branding/locale/sv/LC_MESSAGES/django.mo b/src/branding/locale/sv/LC_MESSAGES/django.mo deleted file mode 100644 index 2ab285d6a1023e625a53854621b82db01bc4e585..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1424 zcmZ{jKa3nT6vmwp0$DCsXk8Y*w5dyzj-`==srU` zf&L!)ujucis{?qT{RO@X{tX@h{{i0xpMbA`a|ana37!H!0Gr@hum?84Z))BJL!R&J z_y_QH#1Ft@;KTa+FW@1>zk@G>f7IiDf~3E%-Kg4?G9{2nM~sfnnXhV9@hl9UsQ#uOXhRc^VAgKLo@67r>Br2@L15RtkITk)(Q zWpcwZ?nQ3wKFg+Z9ow1ekQt=O+4eD1QWr5vTpk{dxvC1hJX0L;EHfkR9rLxaxPEUS zy{Puyv}PA8lhuCmg|H6ikWynyl*amG!{xG{ERAxPbPa|#KTo#AScXZ-GBl^uX|*pU zt&2(LBDGs-yZv#i(`q%=x${XEcipc> zf{-0ylj}M&!4)Z8-j=?xsYaHoWX0H_OG%e8bc>w@s$Lh*X*#n=?T;23UnVz%7Pcy8 z)4(>KI?YzI(_k~J-K_3z@-w_Pd8Bs9I7j8=r`l{hx=q+%w<6lDx4xAMO+$4)?(^U^9rMgAc%DX{Ygq0D6KfOBriC2_lSh`hF}FTmyWcNaQMpdCVy4{A vY#08AndxMKNI_1)ZPd$xBcz1X_o&1lJaZX diff --git a/src/branding/wagtail_hooks.py b/src/branding/wagtail_hooks.py index 2f6fb150..238f588b 100644 --- a/src/branding/wagtail_hooks.py +++ b/src/branding/wagtail_hooks.py @@ -1,6 +1,6 @@ from wagtail.contrib.modeladmin.options import ModelAdmin, \ modeladmin_register, ThumbnailMixin, ModelAdminGroup -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from instagram.models import InstagramFeedAdmin from branding.models import Logo diff --git a/src/events/views/admin_unassign_unpaid.py b/src/events/views/admin_unassign_unpaid.py index c24789b5..ae898ed9 100644 --- a/src/events/views/admin_unassign_unpaid.py +++ b/src/events/views/admin_unassign_unpaid.py @@ -14,7 +14,7 @@ def admin_unassign_unpaid(request, pos_id=None): if 'confirm' in request.POST: for ticket in unpaid_tickets: Participant.objects.filter(ticket=ticket).delete() - EventApplication.filter( + EventApplication.objects.filter( event=event, event_applicant=ticket.owner).delete() ticket.owner = None ticket.save() diff --git a/src/google/locale/sv/LC_MESSAGES/django.mo b/src/google/locale/sv/LC_MESSAGES/django.mo deleted file mode 100644 index f9c75c97ed0b1eb2a7bca3259d987538610b3381..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1135 zcmYL{zi$&s6vqb$zf1rLopcSwqXAB6bA$>x_{1jO1PgB*d7Yf@x`}s~-Sc|Zni&W3 z2hdZ1L`jkKG=M|}azUFCn&>J-bLI7X-^Na!^!77v=l#;|_wd@>D*?L-zYc#1{}n!e z3J+KYo&$667B~XWgReoZc>~UYZ>M|*a{fo~Ech9`0DhVBV0!-z3y}MK0D0~wkn0aXp7V7YAA&sp`!xO!yn^`uX*`D^TsIH$++RSh z&q0i>>@uGG4l7iK(#p8*5}f;UPu_#=B77c>7M1bdY`pKWg<6?ZiWONfEw!2?9qD{W z8QR_@U6#5~)Sq69$mk+>nOHk|KPwY!Hcv%6cV5IL`s^}%CKBn#mcvAOpBwE&GOn(Z zrz+(>y-ZQ6WLo4#(Ua1W&vM6yA!XQOB%M>~0(F%e7v9k@*O{knMWfPrl~SgxBI!v| zA-%Gc;<+IHRB9kLZ26Ds`=FHuTgtk;GQP0&QgI{g)e-5~A+&5#~->T&DN-<|cS)|So(Ju8jF^wQR8b+g^3 z^)Qa;K@^9r_QSB*>_$oQ2U3k5ORa*QlEXT+!}YaI-sC~M{jkUvN~=$DutD64qm#84 z7w*lXeN@QYEKxs`)+yiE?5zg(Px5%JC&~tq>6a-!eVy)a=f1X4 zjIAt!ReWJrCo`%-*SNPtN5{r(LpK_<_}fxVG^H+WYEUd5R{}sg=);vm(#nzCnaN`? zy=8f*!VTn1AG0#i9eXp`^OZ!Th$s6{fvzZ_o5_2KM2nVjezI2-JW*PaOx{;n3AD&P zo5wmqK2&3jr0qhQ0kj3RSkjYy?`L9xDhARJej{|0P4+B}Ci}#xP8kW=Kr7>+*iwD8 F{t5ViBWVBt diff --git a/src/home/locale/sv/LC_MESSAGES/django.mo b/src/home/locale/sv/LC_MESSAGES/django.mo deleted file mode 100644 index 12e98bba56a149eb4832efedf1077cf655a8e797..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1961 zcma)+&u<$=6vv1DqPRez;b-aL6$wfyYivuD${~lQO;MCYSV@YIxG=US>&3e>%gopz zLgJ4=LKQcJTB%nqy>UPmH?CZe=#@*Q3aNiUzi)OnNmI3A<=xND+c)p$Jl{QayJSE#5Z`njohXn=k?Rk%FfRq>)i%9uV29n;N2*1K$-o|f$Z;H@FlPda{MbGfm852 zcq7Vx2RW~MAnQK>p97CV$oZWFUj@&AFM=HqKXDn4m%(L_{eB6a1U2{u_&vydxBWk0OYq&W!uD@86S}Pmj#Nxzzqv`tks<>i`LXuOZw9=~~<(czjwrEMGcpXt{&7>qP z3+0+mRNmND!^f1P1yNh-hZxAKZ~bGk%;#!PSVb2Vy|N_3F7k%@irmO-YeM*bq^L65 z#9r1L97twhj2&hgiMgo3d)RQag{aG1?jY~lUhrMp3)&pp(_DY5P+FObRWp!2gPp6& z4Qy8OyI7MY)gMI9n!gSIZGUv3)oHaFtJ3*o(@O1f>5awCRjJd7OjWW8 z$NSb@a?{4z^4ij#^LDe;kpV&o{nEsuqTLdj?0@Q>WQ# zb{YrgW<|@gH-^U2C?s`LR}3`^M0!@w`G z|Mk%97vb3CyK32(>xRkN7~5=$riaogP0kd=KHQF$j>_4sXc2K;h6@@$k_oTtk+J{7 z7Q0n2wda+idb-yvVY4nt$dS`OXT><)sM-5H0tr?Xp@ zMyhbxP>N;k{Oo3)^G*q+s*;iWi&lN9C81_fv|BQEL$V6%k#S*<_@@X1GtLHMDINmG CCJ6Qb diff --git a/src/instagram/blocks/instagram_feed_chooser_block.py b/src/instagram/blocks/instagram_feed_chooser_block.py index ab992e52..68a4957d 100644 --- a/src/instagram/blocks/instagram_feed_chooser_block.py +++ b/src/instagram/blocks/instagram_feed_chooser_block.py @@ -1,7 +1,7 @@ from wagtail.core import blocks from instagram.models import InstagramFeed from django import forms -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ class InstagramFeedChooserBlock(blocks.ChooserBlock): diff --git a/src/instagram/locale/sv/LC_MESSAGES/django.mo b/src/instagram/locale/sv/LC_MESSAGES/django.mo deleted file mode 100644 index 8007a5075d97db82aefda3f974a07437e2118272..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2143 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 G=6?Ye$hK?% diff --git a/src/involvement/locale/sv/LC_MESSAGES/django.po b/src/involvement/locale/sv/LC_MESSAGES/django.po index b54e8586..676c656a 100644 --- a/src/involvement/locale/sv/LC_MESSAGES/django.po +++ b/src/involvement/locale/sv/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-11-10 20:55+0100\n" -"PO-Revision-Date: 2017-06-26 10:23+0200\n" +"POT-Creation-Date: 2022-11-23 15:37+0100\n" +"PO-Revision-Date: 2022-11-23 15:43+0100\n" "Last-Translator: Jip J. Dekker \n" "Language-Team: \n" "Language: sv_SE\n" @@ -11,7 +11,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.0.2\n" +"X-Generator: Poedit 3.2\n" #: apps.py:7 wagtail_hooks.py:309 msgid "Involvement" @@ -113,8 +113,12 @@ msgstr "Status" msgid "Cover Letter" msgstr "Ansökningsbrev" -#: models/application.py:56 -msgid "Present yourself and state why you are who we are looking for" +#: models/application.py:54 +#, fuzzy +#| msgid "Present yourself and state why you are who we are looking for" +msgid "" +"Present yourself and state why you are \n" +" who we are looking for" msgstr "" "Skriv en presentation av dig själv och en beskrivning av varför du är den vi " "letar efter" @@ -127,16 +131,21 @@ msgstr "Meriter" msgid "Give a summary of relevant qualifications" msgstr "Ge en sammanfattning av relevanta meriter" -#: models/application.py:67 +#: models/application.py:65 msgid "" -"I accept that my data is saved in accordance with Uppsala Union of " -"Engineering and Science Students integrity policy that can be found within " -"the link: " +"\n" +" I accept that my data is saved in accordance\n" +" with Uppsala Union of Engineering and Science Students " +"integrity\n" +" policy that can be found within the link:\n" +" " msgstr "" -"Jag godkänner att mina uppgifter sparas i enlighet med Uppsala teknolog- och " -"naturvetarkårs integritetspolicy som går att hitta på: " +"\n" +" Jag godkänner att mina uppgifter sparas i enlighet med Uppsala teknolog- " +"och naturvetarkårs integritetspolicy som går att hitta på: " + +#: models/application.py:84 -#: models/application.py:82 msgid "Rejection date" msgstr "" diff --git a/src/involvement/migrations/0047_auto_20221114_1721.py b/src/involvement/migrations/0047_auto_20221114_1721.py new file mode 100644 index 00000000..9c77013e --- /dev/null +++ b/src/involvement/migrations/0047_auto_20221114_1721.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.3 on 2022-11-14 16:21 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('involvement', '0046_alter_application_gdpr'), + ] + + operations = [ + migrations.AlterField( + model_name='application', + name='cover_letter', + field=models.TextField(help_text='Present yourself and state why you are \n who we are looking for', verbose_name='Cover Letter'), + ), + migrations.AlterField( + model_name='application', + name='gdpr', + field=models.BooleanField(default=False, help_text='\n I accept that my data is saved in accordance\n with Uppsala Union of Engineering and Science Students integrity\n policy that can be found within the link:\n ', verbose_name='GDPR'), + ), + ] diff --git a/src/involvement/models/application.py b/src/involvement/models/application.py index 9104656c..07ac7a7c 100644 --- a/src/involvement/models/application.py +++ b/src/involvement/models/application.py @@ -51,8 +51,8 @@ class Meta: # ---- Application Information ------ cover_letter = models.TextField( verbose_name=_('Cover Letter'), - help_text=_('Present yourself and state why you are who we are ' - 'looking for'), + help_text=_("""Present yourself and state why you are + who we are looking for"""), ) qualifications = models.TextField( verbose_name=_('Qualifications'), diff --git a/src/locale/sv/LC_MESSAGES/django.mo b/src/locale/sv/LC_MESSAGES/django.mo deleted file mode 100644 index 71cbdf3e9d8d54be31066ec4ad8628bc2c1f2845..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 380 zcmYL@K~KUk7=|%=+R?Lz&%}d9i{c3jGZa>EvE7z2Nc2{r&Y96JZ6W$Y{CoZuJ5A(G zp7i_Dx9RhJeDu}vIq;l#&OC>nD^HugXY4QU{MmN?lNtRkR}RH%w3NnHT4Bh@vF%H^(V-=Ii1iQ$Qo9Pt!I1Rhe%oml#`f^NEGFCKEL->Rc=KoQ6a?!10%_7(V7ey8`V`;n{war z20Z3;uifk31QV^CRQ|iq#``$=;jWunRB8aLH({)F;i8zL{=V00y-I_qTIqGAN(}v% i$^}`yHKImSZ8jEzYJOK6-VWez49^vuhS0kh1f3tbb!oc* diff --git a/src/members/fields.py b/src/members/fields.py index 5c5d785d..69711c8f 100644 --- a/src/members/fields.py +++ b/src/members/fields.py @@ -1,7 +1,7 @@ from django import forms from phonenumbers import parse, is_valid_number from django.utils.translation import gettext_lazy as _ -from django.utils.encoding import force_text +from django.utils.encoding import force_str from utils.validators import SSNValidator @@ -29,7 +29,7 @@ def __init__(self, *args, **kwargs): def to_python(self, value): if value in self.empty_values: return None, '' - value = force_text(value).strip() + value = force_str(value).strip() SSNValidator()(value) return value diff --git a/src/members/locale/sv/LC_MESSAGES/django.mo b/src/members/locale/sv/LC_MESSAGES/django.mo deleted file mode 100644 index 7fcfe65630ba13bea2e9172dd4588763eadabdab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9035 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 error }} {% endfor %} -
{% blocktrans %}If you had an UTN-account before the 23rd of December 2019, you must create a new one because of an update of our database.{% endblocktrans %}
- {% if next %} {% if user.is_authenticated %}
{% blocktrans %}Your account doesn't have access to this page. To proceed, please login with an account that has access.{% endblocktrans %}
diff --git a/src/moore/locale/sv/LC_MESSAGES/django.mo b/src/moore/locale/sv/LC_MESSAGES/django.mo deleted file mode 100644 index ee719f06292f7d39b17002f0159aa1806ff5fbee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1313 zcmZ{j&5j#I5XT!x0yyC-f#edDLIP<~(#zNqVex8_65{=kb`xvujdF+*_0E*XjmO=l zyT>7CF1!G5kbQt0-~=a298o}mBNAsG01im-FMBruL|W?k^+$D8b@hLKIeqL)h4wo7 zdGv44-$cLt3_fU&z~{gpz&F63z?0x_;Pc?`;BoLT@HO!Gvq~KU&w*lp9y|fIK(YT2 zd>Om~ihUOpfBT2~4m^eV6l{W@AFh7|zJU3+pxA#0zJr)Qf|B1K_?!j*1ZDpWk`Vg~ zpzJS!67LfDBKQ#~`E7z?cju5Lcn>(&)i!_?7+O`G+;+Vo>qTP|^M zrlKB)DF<2@Z~Kz0QvzQn)iouP^N9w&c7^J47~2>vTovpr!tQdagQK~}-aRfPY=6kK z*S}71;?>?{5=~`j&&er2AS7oUbFi)?gUoulWtTJcQVpLeDwF33mej<=c+ZDI-S>4M zGd0Ns)eZg=&Xe9M^i2+uNt+tGJnx)u&u09Od7I+&Zm-kW+1lwmiQin# z8XtR<)4|RC3F0LFEWJ0WjCHG&4^4=i*7o}AdgY0ogd1?s9hdt8wP@4IzDe) zbsxsDO>Q!u#URATNBRkO(%6%lKzX6e2J@o(p diff --git a/src/moore/settings/base.py b/src/moore/settings/base.py index 52620977..45bcc60d 100644 --- a/src/moore/settings/base.py +++ b/src/moore/settings/base.py @@ -15,7 +15,7 @@ from django.conf.global_settings import LOGIN_URL from django.utils.translation import gettext_lazy as _ - +from decouple import config, UndefinedValueError import sys # Build paths inside the project like this: os.path.join(BASE_DIR, ...) import os @@ -90,6 +90,17 @@ 'wagtail.contrib.redirects.middleware.RedirectMiddleware', ] +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql', + 'NAME': config('DJANGO_DB_NAME', default='moore'), + 'USER': config('DJANGO_DB_USER', default='moore'), + 'PASSWORD': config('DJANGO_DB_PASS', default='moore'), + 'HOST': config('DJANGO_DB_HOST', default='127.0.0.1'), + 'PORT': config('DJANGO_DB_PORT', default='5432'), + } +} + ROOT_URLCONF = 'moore.urls' TEMPLATES = [ @@ -230,9 +241,28 @@ IS_RUNNING_TEST = 'test' in sys.argv -INSTAGRAM_APP_ID = os.environ.get('INSTAGRAM_APP_ID') -INSTAGRAM_APP_SECRET = os.environ.get('INSTAGRAM_APP_SECRET') -INSTAGRAM_REDIRECT_URL = os.environ.get('INSTAGRAM_REDIRECT_URL') +INSTAGRAM_APP_ID = config('INSTAGRAM_APP_ID', default='') +INSTAGRAM_APP_SECRET = config('INSTAGRAM_APP_SECRET', default='') +INSTAGRAM_REDIRECT_URL = config('INSTAGRAM_REDIRECT_URL', default='') + +try: + MELOS_URL = config('MELOS_URL') + MELOS_ADMIN = config('MELOS_ADMIN') +except UndefinedValueError: + # This allows the tests to be runned without having to have MELOS_URL and + # MELOS_ADMIN since they don't use the MELOS API. But this also raises + # the error if for example a developer tries to start the server but has + # not filled in the variables in their .env. I.e. The variables are still + # required, except for when the tests are runned. + if not IS_RUNNING_TEST: + raise UndefinedValueError( + "You must add MELOS_URL and MELOS_ADMIN to you .env file" + ) + +MELOS_ORG_ID = config('MELOS_ORG_ID', default='') + +# Google API +GOOGLE_API_KEY = config('GOOGLE_API_KEY', default='') REST_FRAMEWORK = { 'DEFAULT_RENDERER_CLASSES': [ diff --git a/src/moore/settings/dev.py b/src/moore/settings/dev.py index 2436a508..bdf14f06 100644 --- a/src/moore/settings/dev.py +++ b/src/moore/settings/dev.py @@ -51,17 +51,6 @@ 'PORT': 5432, } } -else: - DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql', - 'NAME': os.environ.get('DJANGO_DB_NAME', 'moore'), - 'USER': os.environ.get('DJANGO_DB_USER', 'moore'), - 'PASSWORD': os.environ.get('DJANGO_DB_PASS', 'moore'), - 'HOST': os.environ.get('DJANGO_DB_HOST', '127.0.0.1'), - 'PORT': os.environ.get('DJANGO_DB_PORT', '5432'), - } - } # Base URL to use when referring to full URLs within the Wagtail admin # backend - e.g. in notification emails. Don't include '/admin' or a @@ -74,15 +63,3 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' DEFAULT_FROM_EMAIL = 'info@localhost' - -MELOS_URL = os.environ.get('MELOS_URL') -MELOS_ORG_ID = os.environ.get('MELOS_ORG_ID') -MELOS_ADMIN = os.environ.get('MELOS_ADMIN') - -# Google API -GOOGLE_API_KEY = os.environ.get('GOOGLE_API_KEY') - -try: - from .local import * -except ImportError: - pass diff --git a/src/moore/settings/production.py b/src/moore/settings/production.py index 00cfee5c..47f72568 100644 --- a/src/moore/settings/production.py +++ b/src/moore/settings/production.py @@ -20,27 +20,13 @@ DEBUG = False # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = os.environ.get( - 'DJANGO_SECRET', - 'za7^0@54n&p-dg4)_l12q_3^o5awz_uym0osqaz2!myki_8kw0' -) +SECRET_KEY = config('DJANGO_SECRET') # Database # https://docs.djangoproject.com/en/1.10/ref/settings/#databases -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql', - 'NAME': os.environ.get('DJANGO_DB_NAME', 'moore'), - 'USER': os.environ.get('DJANGO_DB_USER', 'moore'), - 'PASSWORD': os.environ.get('DJANGO_DB_PASS'), - 'HOST': os.environ.get('DJANGO_DB_HOST', '127.0.0.1'), - 'PORT': os.environ.get('DJANGO_DB_PORT', '5432'), - } -} - sentry_sdk.init( - dsn=os.environ.get("SENTRY_DSN"), + dsn=config("SENTRY_DSN"), integrations=[DjangoIntegration()], # If you wish to associate users to errors (assuming you are using @@ -48,8 +34,6 @@ send_default_pii=True ) -# CONN_MAX_AGE = 0 - # Base URL to use when referring to full URLs within the Wagtail admin # backend - e.g. in notification emails. Don't include '/admin' or a # trailing slash @@ -96,21 +80,9 @@ SESSION_COOKIE_SECURE = True -MELOS_URL = os.environ.get('MELOS_URL') -MELOS_ORG_ID = os.environ.get('MELOS_ORG_ID') -MELOS_ADMIN = os.environ.get('MELOS_ADMIN') - -# Google API -GOOGLE_API_KEY = os.environ.get('GOOGLE_API_KEY') - -RECAPTCHA_PUBLIC_KEY = os.environ.get("RECAPTCHA_PUBLIC_KEY", "") -RECAPTCHA_PRIVATE_KEY = os.environ.get("RECAPTCHA_PRIVATE_KEY", "") - -try: - from .local import * -except ImportError: - pass +RECAPTCHA_PUBLIC_KEY = config("RECAPTCHA_PUBLIC_KEY") +RECAPTCHA_PRIVATE_KEY = config("RECAPTCHA_PRIVATE_KEY") KRONOS_PREFIX = ( - 'export SENTRY_DSN="{0}" &&'.format(os.environ.get("SENTRY_DSN")) + 'export SENTRY_DSN="{0}" &&'.format(config("SENTRY_DSN")) ) diff --git a/src/moore/settings/staging.py b/src/moore/settings/staging.py deleted file mode 100644 index ebceb96d..00000000 --- a/src/moore/settings/staging.py +++ /dev/null @@ -1,59 +0,0 @@ -""" -Django settings for the development environment of Project Moore. - -For more information on this file, see -https://docs.djangoproject.com/en/1.10/topics/settings/ - -For the full list of settings and their values, see -https://docs.djangoproject.com/en/1.10/ref/settings/ -""" -from __future__ import absolute_import, unicode_literals - -from .base import * - -# SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True - -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 'l0gkw_q4rgex=0%ep84(yw$gx+mxr)u1e-x5yv@2j)a%(4=1!s' - -# Database -# https://docs.djangoproject.com/en/1.10/ref/settings/#databases - - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql', - 'NAME': os.environ.get('DJANGO_DB', 'moore'), - 'USER': os.environ.get('DJANGO_DB_USER', 'moore'), - 'PASSWORD': os.environ.get('DJANGO_DB_PASS', ''), - 'HOST': os.environ.get('DJANGO_DB_HOST', '127.0.0.1'), - 'PORT': os.environ.get('DJANGO_DB_PORT', '5432'), - } -} - -# Base URL to use when referring to full URLs within the Wagtail admin -# backend - e.g. in notification emails. Don't include '/admin' or a -# trailing slash -BASE_URL = 'moore.swace.se' - -ALLOWED_HOSTS = ['.swace.se', '.utn.swace.se'] - -# Email -# https://docs.djangoproject.com/en/1.10/ref/settings/#email-backend - -EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' - -DEFAULT_FROM_EMAIL = 'info@moore.swace.se' - -MELOS_URL = os.environ.get('MELOS_URL') -MELOS_ORG_ID = os.environ.get('MELOS_ORG_ID') -MELOS_ADMIN = os.environ.get('MELOS_ADMIN') - -# Google API -GOOGLE_API_KEY = os.environ.get('GOOGLE_API_KEY') - -try: - from .local import * -except ImportError: - pass diff --git a/src/moore/static/sass/partials/pages/_all.scss b/src/moore/static/sass/partials/pages/_all.scss index 1a87466f..97a8e6f3 100644 --- a/src/moore/static/sass/partials/pages/_all.scss +++ b/src/moore/static/sass/partials/pages/_all.scss @@ -5,4 +5,3 @@ @import "search"; @import "contact"; @import "google_calendar"; -@import "login"; \ No newline at end of file diff --git a/src/moore/static/sass/partials/pages/_login.scss b/src/moore/static/sass/partials/pages/_login.scss deleted file mode 100644 index a09bab99..00000000 --- a/src/moore/static/sass/partials/pages/_login.scss +++ /dev/null @@ -1,7 +0,0 @@ -.registration-warning { - background: $yellow-color; - color: $secondary-color; - padding: 20px; - margin-bottom: 40px; - border-radius: 12px; -} \ No newline at end of file diff --git a/src/news/locale/sv/LC_MESSAGES/django.mo b/src/news/locale/sv/LC_MESSAGES/django.mo deleted file mode 100644 index 8ed99e9d9bb71107da0fe4bac8f82c0e554ae163..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 777 zcmYk3J#Q015QaC9@Ns+;sVN335ZdE>MTpKaLIfKu#m3kMLAmjb&xg-@*6!ND56JfuNwHLi_;UJx2;FJ$i3u-ksUo{l2^XSzuiSw?GPRfN#LBA0Plf!Da9p zTmyf>HV|7vB#<4buRn%ffj&QrUqbJIx4`%LaA8yb2=#M5LH)ij&_~d((Cg4&(3{Xd zXZ5X%)u_sgwAcaFeCQ?M&kt+0V6Dzj1qX(e+-P`-I6qv zlyUi}U`rFVWIAHjG+!L~Jut7>g)}rPQklv%73gY0(KF?&bSwt!T&^=K2FINGAt=1# zk(2FIzGh?dQYRGjd0rYPJ2uNx`DBq2k)I*lgESayw9!7a!E4)O4S7lv=W613Su?QH8mu5WIF}k02Vf8rt%0# z%zX`ncnB6YE(Hlr{@wr1zVlgrpPPJSWK+Zl11CZ32n;+a?; zW9*f5f_S5Np7evX==&sHApIhxHL`K?#aU5bSTUQ`b&BjzgF%}o&O%q`Dq<%nOsDrN zpmPJ)cwwbO)-w7MJB~LZeul>E^8?@a4uo~QZG^IkaN1DkflzTSV&rWU>AyS#+xMD{=I-C{a>@60 zv~sBEj@yieIJ|M|St6vWK&K~+MOQs-@A0j_x?)xr4c}EA9Z403uyrAw*Gh6D627NR zYC}-jD7Dp~0zYAOMZr=P%BvOcobRJT^Yh-8#z;B{N`5KuSRGT=P_g*^Q{kYSD<#;; V@a1acAR7*#KO7k7VQOV0*f;v|jLZN4 diff --git a/src/utils/data_migrations.py b/src/utils/data_migrations.py index d97c3456..b8e504e8 100644 --- a/src/utils/data_migrations.py +++ b/src/utils/data_migrations.py @@ -79,7 +79,7 @@ def block_filter(block, predicate_func): def stream_field_filter_map(stream_field, block_type, mapper_func): new_stream_data = [] - for block in stream_field.stream_data: + for block in stream_field.raw_data: new_stream_data.append( block_filter_map(block, block_type, mapper_func) )