From 12775a2d1e3843c06928f95de0e73e59360b5dcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Mon, 31 Jul 2023 15:55:17 +0200 Subject: [PATCH] fix: ignore discussion units when forum is not enabled This is a backport of a commit to the master branch: https://github.com/openedx/edx-platform/pull/32464 In particular, it will fix many issues that appear when the demo course is imported. --- changelog.d/20230731_155418_regis_fix_discussion_units.md | 1 + tutor/templates/build/openedx/Dockerfile | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 changelog.d/20230731_155418_regis_fix_discussion_units.md diff --git a/changelog.d/20230731_155418_regis_fix_discussion_units.md b/changelog.d/20230731_155418_regis_fix_discussion_units.md new file mode 100644 index 00000000000..55ad28497e2 --- /dev/null +++ b/changelog.d/20230731_155418_regis_fix_discussion_units.md @@ -0,0 +1 @@ +- [Bugfix] Do not display discussion units when the forum is not enabled. (by @regisb) diff --git a/tutor/templates/build/openedx/Dockerfile b/tutor/templates/build/openedx/Dockerfile index b6b1d0ef281..097d74949dc 100644 --- a/tutor/templates/build/openedx/Dockerfile +++ b/tutor/templates/build/openedx/Dockerfile @@ -53,6 +53,9 @@ RUN git config --global user.email "tutor@overhang.io" \ # Security advisory: https://github.com/openedx/edx-platform/security/advisories/GHSA-3q74-3rfh-g37j # https://github.com/openedx/edx-platform/pull/32838 RUN curl -fsSL https://github.com/openedx/edx-platform/commit/163259779297a7dccb28e1f8c3dfa4d2cbdb9655.patch | git am +# Fix discussion units when forum is not enabled +# https://github.com/openedx/edx-platform/pull/32464 +RUN curl -fsSL https://github.com/openedx/edx-platform/commit/a9f66705503288c360055ab80c7c3bfb884f75fe.patch | git am {%- endif %} {# Example: RUN curl -fsSL https://github.com/openedx/edx-platform/commit/.patch | git am #}