chore: Cleanup last remenants of the edx-microsite code. (#30306)

There are still references to the word `microsite` because the
site-configuration code uses it to referr to it's sub-sites in a few
places.
This commit is contained in:
Feanil Patel
2022-04-25 10:48:35 -04:00
committed by GitHub
parent aefdda9df3
commit f2ec7b5053
6 changed files with 1 additions and 15 deletions

View File

@@ -2530,10 +2530,6 @@ BLOCKSTORE_BUNDLE_CACHE_TIMEOUT = 3000
###################### LEARNER PORTAL ################################
LEARNER_PORTAL_URL_ROOT = 'https://learner-portal-localhost:18000'
######################### MICROSITE ###############################
MICROSITE_ROOT_DIR = '/edx/app/edxapp/edx-microsite'
MICROSITE_CONFIGURATION = {}
############################ JWT #################################
JWT_ISSUER = 'http://127.0.0.1:8000/oauth2'
DEFAULT_JWT_ISSUER = {

View File

@@ -352,8 +352,6 @@ LOG_DIR: /edx/var/log/edx
MAINTENANCE_BANNER_TEXT: Sample banner message
MEDIA_ROOT: /edx/var/edxapp/media/
MEDIA_URL: /media/
MICROSITE_CONFIGURATION: {}
MICROSITE_ROOT_DIR: /edx/app/edxapp/edx-microsite
MKTG_URLS: {}
MKTG_URL_LINK_MAP: {}
MOBILE_STORE_URLS: {}

View File

@@ -13,7 +13,6 @@ LMS and Studio.
common/djangoapps/edxmako/modules
common/djangoapps/enrollment/modules
common/djangoapps/entitlements/modules
common/djangoapps/microsite_configuration/modules
common/djangoapps/pipeline_mako/modules
common/djangoapps/static_replace/modules
common/djangoapps/status/modules

View File

@@ -5039,10 +5039,6 @@ BUNDLE_ASSET_STORAGE_SETTINGS = dict(
),
)
######################### MICROSITE ###############################
MICROSITE_ROOT_DIR = '/edx/app/edxapp/edx-microsite'
MICROSITE_CONFIGURATION = {}
SYSLOG_SERVER = ''
FEEDBACK_SUBMISSION_EMAIL = ''
GITHUB_REPO_ROOT = '/edx/var/edxapp/data'

View File

@@ -393,8 +393,6 @@ MAILCHIMP_NEW_USER_LIST_ID: null
MAINTENANCE_BANNER_TEXT: Sample banner message
MEDIA_ROOT: /edx/var/edxapp/media/
MEDIA_URL: /media/
MICROSITE_CONFIGURATION: {}
MICROSITE_ROOT_DIR: /edx/app/edxapp/edx-microsite
MKTG_URLS: {}
MKTG_URL_LINK_MAP: {}
MOBILE_STORE_URLS: {}

View File

@@ -37,9 +37,8 @@ def get_template_path(relative_path, **kwargs): # lint-amnesty, pylint: disable
def is_request_in_themed_site():
"""
This is a proxy function to hide microsite_configuration behind comprehensive theming.
This is a proxy function to site_configuration.
"""
# We need to give priority to theming/site-configuration over microsites
return configuration_helpers.is_site_configuration_enabled()