Commit 41d86992 by Bill Filler

revert files not specific to gated-content

parent 08645b78
......@@ -216,7 +216,7 @@ FEATURES = {
'MILESTONES_APP': False,
# Prerequisite courses feature flag
'ENABLE_PREREQUISITE_COURSES': True,
'ENABLE_PREREQUISITE_COURSES': False,
# Toggle course entrance exams feature
'ENTRANCE_EXAMS': False,
......@@ -225,10 +225,10 @@ FEATURES = {
'LICENSING': False,
# Enable the courseware search functionality
'ENABLE_COURSEWARE_INDEX': True,
'ENABLE_COURSEWARE_INDEX': False,
# Enable content libraries search functionality
'ENABLE_LIBRARY_INDEX': True,
'ENABLE_LIBRARY_INDEX': False,
# Enable course reruns, which will always use the split modulestore
'ALLOW_COURSE_RERUNS': True,
......@@ -1323,7 +1323,7 @@ FILES_AND_UPLOAD_TYPE_FILTERS = {
}
# Default to no Search Engine
SEARCH_ENGINE = "search.elastic.ElasticSearchEngine"
SEARCH_ENGINE = None
ELASTIC_FIELD_MAPPINGS = {
"start_date": {
"type": "date"
......
......@@ -14,8 +14,8 @@ CMS_BASE = 'edx.devstack.studio:18010'
LMS_ROOT_URL = 'http://{}'.format(LMS_BASE)
FEATURES.update({
'ENABLE_COURSEWARE_INDEX': True,
'ENABLE_LIBRARY_INDEX': True,
'ENABLE_COURSEWARE_INDEX': False,
'ENABLE_LIBRARY_INDEX': False,
'ENABLE_DISCUSSION_SERVICE': True,
})
......
......@@ -15,7 +15,7 @@ from openedx.features.course_experience import COURSE_PRE_START_ACCESS_FLAG
from student.roles import CourseBetaTesterRole
from xmodule.util.django import get_current_request_hostname
DEBUG_ACCESS = True
DEBUG_ACCESS = False
log = getLogger(__name__)
ACCESS_GRANTED = AccessResponse(True)
......
......@@ -302,10 +302,10 @@ FEATURES = {
'EXPOSE_CACHE_PROGRAMS_ENDPOINT': False,
# Courseware search feature
'ENABLE_COURSEWARE_SEARCH': True,
'ENABLE_COURSEWARE_SEARCH': False,
# Dashboard search feature
'ENABLE_DASHBOARD_SEARCH': True,
'ENABLE_DASHBOARD_SEARCH': False,
# log all information from cybersource callbacks
'LOG_POSTPAY_CALLBACKS': True,
......@@ -2996,78 +2996,6 @@ SEARCH_FILTER_GENERATOR = "lms.lib.courseware_search.lms_filter_generator.LmsSea
# Override to skip enrollment start date filtering in course search
SEARCH_SKIP_ENROLLMENT_START_DATE_FILTERING = False
# Elasticsearch uses index settings to specify available analyzers.
# We are adding the lowercase analyzer and tweaking the ngram analyzers here,
# so we need to use these settings rather than the index defaults.
# We are making these changes to enable autocomplete for the typeahead endpoint.
# In addition we are specifying the number of shards and replicas that indices
# will be created with as recommended here:
# https://aws.amazon.com/blogs/database/get-started-with-amazon-elasticsearch-service-how-many-shards-do-i-need/
ELASTICSEARCH_INDEX_SETTINGS = {
'settings': {
'index': {
'number_of_shards': 1,
'number_of_replicas': 1
},
'analysis': {
'tokenizer': {
'haystack_edgengram_tokenizer': {
'type': 'edgeNGram',
'side': 'front',
'min_gram': 2,
'max_gram': 15
},
'haystack_ngram_tokenizer': {
'type': 'nGram',
'min_gram': 2,
'max_gram': 15
}
},
'analyzer': {
'lowercase': {
'type': 'custom',
'tokenizer': 'keyword',
'filter': [
'lowercase',
'synonym',
]
},
'snowball_with_synonyms': {
'type': 'custom',
'filter': [
'standard',
'lowercase',
'snowball',
'synonym'
],
'tokenizer': 'standard'
},
'ngram_analyzer': {
'type':'custom',
'filter': [
'lowercase',
'haystack_ngram',
'synonym',
],
'tokenizer': 'keyword'
}
},
'filter': {
'haystack_ngram': {
'type': 'nGram',
'min_gram': 2,
'max_gram': 22
},
'synonym' : {
'type': 'synonym',
'ignore_case': 'true',
'synonyms': []
}
}
}
}
}
### PERFORMANCE EXPERIMENT SETTINGS ###
# CDN experiment/monitoring flags
CDN_VIDEO_URLS = {}
......
......@@ -36,12 +36,12 @@ JWT_AUTH.update({
FEATURES.update({
'AUTOMATIC_AUTH_FOR_TESTING': True,
'ENABLE_COURSEWARE_SEARCH': True,
'ENABLE_COURSE_DISCOVERY': True,
'ENABLE_DASHBOARD_SEARCH': True,
'ENABLE_COURSEWARE_SEARCH': False,
'ENABLE_COURSE_DISCOVERY': False,
'ENABLE_DASHBOARD_SEARCH': False,
'ENABLE_DISCUSSION_SERVICE': True,
'SHOW_HEADER_LANGUAGE_SELECTOR': True,
'ENABLE_ENTERPRISE_INTEGRATION': True,
'ENABLE_ENTERPRISE_INTEGRATION': False,
})
ENABLE_MKTG_SITE = os.environ.get('ENABLE_MARKETING_SITE', False)
......
......@@ -324,9 +324,7 @@ def enterprise_enabled():
"""
Determines whether the Enterprise app is installed
"""
is_enabled = 'enterprise' in settings.INSTALLED_APPS and settings.FEATURES.get('ENABLE_ENTERPRISE_INTEGRATION', False)
LOGGER.warning("BF!! enterprise enabled=%s", is_enabled)
return is_enabled
return 'enterprise' in settings.INSTALLED_APPS and settings.FEATURES.get('ENABLE_ENTERPRISE_INTEGRATION', False)
def enterprise_customer_uuid_for_request(request):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment