fix: ignore discussion units when forum is not enabled

This is a backport of a commit to the master branch: openedx/edx-platform#32464 In particular, it will fix many issues that appear when the demo course is imported.
kdmccormick · Jul 31, 2023 · d7eb539 · d7eb539
1 parent 2bca024
commit d7eb539
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/changelog.d/20230731_155418_regis_fix_discussion_units.md 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
@@ -53,6 +53,9 @@ RUN git config --global user.email "[email protected]" \
 # 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/<GITSHA1>.patch | git am #}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- [Bugfix] Do not display discussion units when the forum is not enabled. (by @regisb)