Introduction of the Microsite feature which allows for limited multi-tenant branding on a subdomain basis, e.g. foo.edx.org and bar.edx.org
fix errorenous logic when running a microsite that could reside in a hosting environment with a marketing site in front of it pep8/pylint fixes address PR feedback, remove underscore from test hostname more pep8/pylint cleanup. Skip test_microsites test, it works on localdev, not on Jenkins. Need to talk with QA team manually add Ned's single-to-double quote fix change aws.py runtimes so that the microsite_dir that is read from configuration is changed to a python path Conflicts: lms/templates/help_modal.html
This commit is contained in:
committed by
Don Mitchell
parent
a86086b771
commit
a3211a7405
@@ -1,5 +1,6 @@
|
||||
""" Utility functions related to HTTP requests """
|
||||
from django.conf import settings
|
||||
from microsite_configuration.middleware import MicrositeConfiguration
|
||||
|
||||
|
||||
def safe_get_host(request):
|
||||
@@ -14,4 +15,4 @@ def safe_get_host(request):
|
||||
if isinstance(settings.ALLOWED_HOSTS, (list, tuple)) and '*' not in settings.ALLOWED_HOSTS:
|
||||
return request.get_host()
|
||||
else:
|
||||
return settings.SITE_NAME
|
||||
return MicrositeConfiguration.get_microsite_configuration_value('site_domain', settings.SITE_NAME)
|
||||
|
||||
Reference in New Issue
Block a user