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
68645db3
Commit
68645db3
authored
Aug 06, 2015
by
cahrens
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reduce dependency on courseware_js.
TNL-2945
parent
a7c06fd2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
17 deletions
+10
-17
lms/djangoapps/student_account/views.py
+1
-0
lms/djangoapps/student_profile/views.py
+2
-1
lms/djangoapps/teams/views.py
+2
-1
lms/envs/common.py
+5
-15
No files found.
lms/djangoapps/student_account/views.py
View file @
68645db3
...
@@ -381,6 +381,7 @@ def account_settings_context(request):
...
@@ -381,6 +381,7 @@ def account_settings_context(request):
'platform_name'
:
settings
.
PLATFORM_NAME
,
'platform_name'
:
settings
.
PLATFORM_NAME
,
'user_accounts_api_url'
:
reverse
(
"accounts_api"
,
kwargs
=
{
'username'
:
user
.
username
}),
'user_accounts_api_url'
:
reverse
(
"accounts_api"
,
kwargs
=
{
'username'
:
user
.
username
}),
'user_preferences_api_url'
:
reverse
(
'preferences_api'
,
kwargs
=
{
'username'
:
user
.
username
}),
'user_preferences_api_url'
:
reverse
(
'preferences_api'
,
kwargs
=
{
'username'
:
user
.
username
}),
'disable_courseware_js'
:
True
,
}
}
if
third_party_auth
.
is_enabled
():
if
third_party_auth
.
is_enabled
():
...
...
lms/djangoapps/student_profile/views.py
View file @
68645db3
...
@@ -92,6 +92,7 @@ def learner_profile_context(logged_in_user, profile_username, user_is_staff, bui
...
@@ -92,6 +92,7 @@ def learner_profile_context(logged_in_user, profile_username, user_is_staff, bui
'country_options'
:
list
(
countries
),
'country_options'
:
list
(
countries
),
'language_options'
:
settings
.
ALL_LANGUAGES
,
'language_options'
:
settings
.
ALL_LANGUAGES
,
'platform_name'
:
microsite
.
get_value
(
'platform_name'
,
settings
.
PLATFORM_NAME
),
'platform_name'
:
microsite
.
get_value
(
'platform_name'
,
settings
.
PLATFORM_NAME
),
}
},
'disable_courseware_js'
:
True
,
}
}
return
context
return
context
lms/djangoapps/teams/views.py
View file @
68645db3
...
@@ -102,7 +102,8 @@ class TeamsDashboardView(View):
...
@@ -102,7 +102,8 @@ class TeamsDashboardView(View):
"languages"
:
settings
.
ALL_LANGUAGES
,
"languages"
:
settings
.
ALL_LANGUAGES
,
"countries"
:
list
(
countries
),
"countries"
:
list
(
countries
),
"username"
:
user
.
username
,
"username"
:
user
.
username
,
"privileged"
:
has_discussion_privileges
(
user
,
course_key
)
"privileged"
:
has_discussion_privileges
(
user
,
course_key
),
"disable_courseware_js"
:
True
,
}
}
return
render_to_response
(
"teams/teams.html"
,
context
)
return
render_to_response
(
"teams/teams.html"
,
context
)
...
...
lms/envs/common.py
View file @
68645db3
...
@@ -1248,6 +1248,11 @@ main_vendor_js = base_vendor_js + [
...
@@ -1248,6 +1248,11 @@ main_vendor_js = base_vendor_js + [
base_application_js
=
[
base_application_js
=
[
'js/src/utility.js'
,
'js/src/utility.js'
,
'js/src/logger.js'
,
'js/src/logger.js'
,
'js/my_courses_dropdown.js'
,
'js/src/string_utils.js'
,
'js/form.ext.js'
,
'js/src/ie_shim.js'
,
'js/src/accessibility_tools.js'
,
]
]
dashboard_js
=
(
dashboard_js
=
(
...
@@ -1267,14 +1272,9 @@ instructor_dash_js = (
...
@@ -1267,14 +1272,9 @@ instructor_dash_js = (
# JavaScript modules.
# JavaScript modules.
student_account_js
=
[
student_account_js
=
[
'js/utils/edx.utils.validate.js'
,
'js/utils/edx.utils.validate.js'
,
'js/form.ext.js'
,
'js/my_courses_dropdown.js'
,
'js/toggle_login_modal.js'
,
'js/toggle_login_modal.js'
,
'js/sticky_filter.js'
,
'js/sticky_filter.js'
,
'js/query-params.js'
,
'js/query-params.js'
,
'js/src/accessibility_tools.js'
,
'js/src/ie_shim.js'
,
'js/src/string_utils.js'
,
'js/student_account/models/LoginModel.js'
,
'js/student_account/models/LoginModel.js'
,
'js/student_account/models/RegisterModel.js'
,
'js/student_account/models/RegisterModel.js'
,
'js/student_account/models/PasswordResetModel.js'
,
'js/student_account/models/PasswordResetModel.js'
,
...
@@ -1289,14 +1289,9 @@ student_account_js = [
...
@@ -1289,14 +1289,9 @@ student_account_js = [
]
]
verify_student_js
=
[
verify_student_js
=
[
'js/form.ext.js'
,
'js/my_courses_dropdown.js'
,
'js/toggle_login_modal.js'
,
'js/toggle_login_modal.js'
,
'js/sticky_filter.js'
,
'js/sticky_filter.js'
,
'js/query-params.js'
,
'js/query-params.js'
,
'js/src/accessibility_tools.js'
,
'js/src/ie_shim.js'
,
'js/src/string_utils.js'
,
'js/verify_student/models/verification_model.js'
,
'js/verify_student/models/verification_model.js'
,
'js/verify_student/views/error_view.js'
,
'js/verify_student/views/error_view.js'
,
'js/verify_student/views/image_input_view.js'
,
'js/verify_student/views/image_input_view.js'
,
...
@@ -1487,14 +1482,9 @@ PIPELINE_JS = {
...
@@ -1487,14 +1482,9 @@ PIPELINE_JS = {
# Application will contain all paths not in courseware_only_js
# Application will contain all paths not in courseware_only_js
'source_filenames'
:
[
'js/xblock/core.js'
]
+
sorted
(
common_js
)
+
sorted
(
project_js
)
+
base_application_js
+
[
'source_filenames'
:
[
'js/xblock/core.js'
]
+
sorted
(
common_js
)
+
sorted
(
project_js
)
+
base_application_js
+
[
'js/form.ext.js'
,
'js/my_courses_dropdown.js'
,
'js/toggle_login_modal.js'
,
'js/toggle_login_modal.js'
,
'js/sticky_filter.js'
,
'js/sticky_filter.js'
,
'js/query-params.js'
,
'js/query-params.js'
,
'js/src/accessibility_tools.js'
,
'js/src/ie_shim.js'
,
'js/src/string_utils.js'
,
],
],
'output_filename'
:
'js/lms-application.js'
,
'output_filename'
:
'js/lms-application.js'
,
},
},
...
...
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