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
60221dcc
Commit
60221dcc
authored
Mar 17, 2017
by
Ned Batchelder
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Get the doc version from openedx.core.release, instead of an ini file
parent
3bb8061f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
common/djangoapps/util/help_context_processor.py
+5
-3
docs/cms_config.ini
+0
-1
docs/lms_config.ini
+0
-1
No files found.
common/djangoapps/util/help_context_processor.py
View file @
60221dcc
...
...
@@ -4,9 +4,11 @@ Online Contextual Help.
"""
import
ConfigParser
from
django.conf
import
settings
import
logging
from
django.conf
import
settings
from
openedx.core.release
import
doc_version
log
=
logging
.
getLogger
(
__name__
)
...
...
@@ -76,7 +78,7 @@ def common_doc_url(request, config_file_object): # pylint: disable=unused-argum
return
"{url_base}/{language}/{version}/{page_path}"
.
format
(
url_base
=
doc_base_url
,
language
=
get_config_value_with_default
(
"locales"
,
settings
.
LANGUAGE_CODE
),
version
=
config_file_object
.
get
(
"help_settings"
,
"version"
),
version
=
doc_version
(
),
page_path
=
get_config_value_with_default
(
"pages"
,
page_token
),
)
...
...
@@ -102,7 +104,7 @@ def common_doc_url(request, config_file_object): # pylint: disable=unused-argum
# Construct and return the URL for the PDF link.
return
"{pdf_base}/{version}/{pdf_file}"
.
format
(
pdf_base
=
pdf_base_url
,
version
=
config_file_object
.
get
(
"help_settings"
,
"version"
),
version
=
doc_version
(
),
pdf_file
=
config_file_object
.
get
(
"pdf_settings"
,
"pdf_file"
),
)
...
...
docs/cms_config.ini
View file @
60221dcc
...
...
@@ -2,7 +2,6 @@
[help_settings]
# The optional DOC_LINK_BASE_URL configuration property will override url_base
url_base
=
http://edx.readthedocs.io/projects/open-edx-building-and-running-a-course
version
=
latest
# below are the pdf settings for the pdf file
...
...
docs/lms_config.ini
View file @
60221dcc
...
...
@@ -2,7 +2,6 @@
[help_settings]
# The optional DOC_LINK_BASE_URL configuration property will override url_base
url_base
=
http://edx.readthedocs.io/projects/open-edx-learner-guide
version
=
latest
# below are the pdf settings for the pdf file
...
...
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