Merge remote-tracking branch 'origin/master' into nightly

kdmccormick · Jul 17, 2023 · b3ef12c · b3ef12c
2 parents 272a5ee + 3affd54
commit b3ef12c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/changelog.d/20230714_100627_kyle.md b/changelog.d/20230714_100627_kyle.md
@@ -0,0 +1 @@
+- [Bugfix] Improve `tutor ... do settheme default` so that it reverts to the default theme rather than trying to switch to a nonexistent theme named "default". This will clear up some error noise from LMS/CMS logs. (by @kdmccormick)
diff --git a/tutor/commands/jobs.py b/tutor/commands/jobs.py
@@ -216,7 +216,8 @@ def assign_theme(name, domain):
         site.name = domain[:name_max_length]
         site.save()
     site.themes.all().delete()
-    site.themes.create(theme_dir_name=name)
+    if name != 'default':
+        site.themes.create(theme_dir_name=name)
 """
     domain_names = domain_names or [
         "{{ LMS_HOST }}",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- [Bugfix] Improve `tutor ... do settheme default` so that it reverts to the default theme rather than trying to switch to a nonexistent theme named "default". This will clear up some error noise from LMS/CMS logs. (by @kdmccormick)