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
f5275a54
Commit
f5275a54
authored
Jun 29, 2015
by
dino-cikatic
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8575 from edx/dcikatic/fix-search-engine-set
Fix SEARCH_ENGINE set logic in settings files
parents
614bcafb
b5dfb5ed
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
lms/envs/acceptance.py
+3
-1
lms/envs/aws.py
+3
-1
No files found.
lms/envs/acceptance.py
View file @
f5275a54
...
...
@@ -179,7 +179,9 @@ YOUTUBE['API'] = "127.0.0.1:{0}/get_youtube_api/".format(YOUTUBE_PORT)
YOUTUBE
[
'TEST_URL'
]
=
"127.0.0.1:{0}/test_youtube/"
.
format
(
YOUTUBE_PORT
)
YOUTUBE
[
'TEXT_API'
][
'url'
]
=
"127.0.0.1:{0}/test_transcripts_youtube/"
.
format
(
YOUTUBE_PORT
)
if
FEATURES
.
get
(
'ENABLE_COURSEWARE_SEARCH'
)
or
FEATURES
.
get
(
'ENABLE_DASHBOARD_SEARCH'
):
if
FEATURES
.
get
(
'ENABLE_COURSEWARE_SEARCH'
)
or
\
FEATURES
.
get
(
'ENABLE_DASHBOARD_SEARCH'
)
or
\
FEATURES
.
get
(
'ENABLE_COURSE_DISCOVERY'
):
# Use MockSearchEngine as the search engine for test scenario
SEARCH_ENGINE
=
"search.tests.mock_search_engine.MockSearchEngine"
...
...
lms/envs/aws.py
View file @
f5275a54
...
...
@@ -612,7 +612,9 @@ PDF_RECEIPT_COBRAND_LOGO_HEIGHT_MM = ENV_TOKENS.get(
'PDF_RECEIPT_COBRAND_LOGO_HEIGHT_MM'
,
PDF_RECEIPT_COBRAND_LOGO_HEIGHT_MM
)
if
FEATURES
.
get
(
'ENABLE_COURSEWARE_SEARCH'
)
or
FEATURES
.
get
(
'ENABLE_DASHBOARD_SEARCH'
):
if
FEATURES
.
get
(
'ENABLE_COURSEWARE_SEARCH'
)
or
\
FEATURES
.
get
(
'ENABLE_DASHBOARD_SEARCH'
)
or
\
FEATURES
.
get
(
'ENABLE_COURSE_DISCOVERY'
):
# Use ElasticSearch as the search engine herein
SEARCH_ENGINE
=
"search.elastic.ElasticSearchEngine"
...
...
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