Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
41d86992
Commit
41d86992
authored
Nov 27, 2017
by
Bill Filler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
revert files not specific to gated-content
parent
08645b78
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
88 deletions
+14
-88
cms/envs/common.py
+4
-4
cms/envs/devstack_docker.py
+2
-2
lms/djangoapps/courseware/access_utils.py
+1
-1
lms/envs/common.py
+2
-74
lms/envs/devstack_docker.py
+4
-4
openedx/features/enterprise_support/api.py
+1
-3
No files found.
cms/envs/common.py
View file @
41d86992
...
...
@@ -216,7 +216,7 @@ FEATURES = {
'MILESTONES_APP'
:
False
,
# Prerequisite courses feature flag
'ENABLE_PREREQUISITE_COURSES'
:
Tru
e
,
'ENABLE_PREREQUISITE_COURSES'
:
Fals
e
,
# Toggle course entrance exams feature
'ENTRANCE_EXAMS'
:
False
,
...
...
@@ -225,10 +225,10 @@ FEATURES = {
'LICENSING'
:
False
,
# Enable the courseware search functionality
'ENABLE_COURSEWARE_INDEX'
:
Tru
e
,
'ENABLE_COURSEWARE_INDEX'
:
Fals
e
,
# Enable content libraries search functionality
'ENABLE_LIBRARY_INDEX'
:
Tru
e
,
'ENABLE_LIBRARY_INDEX'
:
Fals
e
,
# 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"
...
...
cms/envs/devstack_docker.py
View file @
41d86992
...
...
@@ -14,8 +14,8 @@ CMS_BASE = 'edx.devstack.studio:18010'
LMS_ROOT_URL
=
'http://{}'
.
format
(
LMS_BASE
)
FEATURES
.
update
({
'ENABLE_COURSEWARE_INDEX'
:
Tru
e
,
'ENABLE_LIBRARY_INDEX'
:
Tru
e
,
'ENABLE_COURSEWARE_INDEX'
:
Fals
e
,
'ENABLE_LIBRARY_INDEX'
:
Fals
e
,
'ENABLE_DISCUSSION_SERVICE'
:
True
,
})
...
...
lms/djangoapps/courseware/access_utils.py
View file @
41d86992
...
...
@@ -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
=
Tru
e
DEBUG_ACCESS
=
Fals
e
log
=
getLogger
(
__name__
)
ACCESS_GRANTED
=
AccessResponse
(
True
)
...
...
lms/envs/common.py
View file @
41d86992
...
...
@@ -302,10 +302,10 @@ FEATURES = {
'EXPOSE_CACHE_PROGRAMS_ENDPOINT'
:
False
,
# Courseware search feature
'ENABLE_COURSEWARE_SEARCH'
:
Tru
e
,
'ENABLE_COURSEWARE_SEARCH'
:
Fals
e
,
# Dashboard search feature
'ENABLE_DASHBOARD_SEARCH'
:
Tru
e
,
'ENABLE_DASHBOARD_SEARCH'
:
Fals
e
,
# 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
=
{}
...
...
lms/envs/devstack_docker.py
View file @
41d86992
...
...
@@ -36,12 +36,12 @@ JWT_AUTH.update({
FEATURES
.
update
({
'AUTOMATIC_AUTH_FOR_TESTING'
:
True
,
'ENABLE_COURSEWARE_SEARCH'
:
Tru
e
,
'ENABLE_COURSE_DISCOVERY'
:
Tru
e
,
'ENABLE_DASHBOARD_SEARCH'
:
Tru
e
,
'ENABLE_COURSEWARE_SEARCH'
:
Fals
e
,
'ENABLE_COURSE_DISCOVERY'
:
Fals
e
,
'ENABLE_DASHBOARD_SEARCH'
:
Fals
e
,
'ENABLE_DISCUSSION_SERVICE'
:
True
,
'SHOW_HEADER_LANGUAGE_SELECTOR'
:
True
,
'ENABLE_ENTERPRISE_INTEGRATION'
:
Tru
e
,
'ENABLE_ENTERPRISE_INTEGRATION'
:
Fals
e
,
})
ENABLE_MKTG_SITE
=
os
.
environ
.
get
(
'ENABLE_MARKETING_SITE'
,
False
)
...
...
openedx/features/enterprise_support/api.py
View file @
41d86992
...
...
@@ -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
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment