diff --git a/common/djangoapps/student/tests/tests.py b/common/djangoapps/student/tests/tests.py index 319359fd96..38e5084196 100644 --- a/common/djangoapps/student/tests/tests.py +++ b/common/djangoapps/student/tests/tests.py @@ -298,7 +298,7 @@ class DashboardTest(ModuleStoreTestCase): self.assertIsNone(course_mode_info['days_for_upsell']) @unittest.skipUnless(settings.ROOT_URLCONF == 'lms.urls', 'Test only valid in lms') - @patch('courseware.index.log.warning') + @patch('courseware.views.index.log.warning') @patch.dict('django.conf.settings.FEATURES', {'ENABLE_PAID_COURSE_REGISTRATION': True}) def test_blocked_course_scenario(self, log_warning): diff --git a/common/lib/xmodule/xmodule/lti_module.py b/common/lib/xmodule/xmodule/lti_module.py index 84b1e71640..ed2b05a7d9 100644 --- a/common/lib/xmodule/xmodule/lti_module.py +++ b/common/lib/xmodule/xmodule/lti_module.py @@ -43,7 +43,7 @@ What is supported: (http://www.imsglobal.org/lti/ltiv2p0/uml/purl.imsglobal.org/vocab/lis/v2/outcomes/Result/service.html) a.) Discovery of all such LTI http endpoints for a course. External tools GET from this discovery endpoint and receive URLs for interacting with individual grading units. - (see lms/djangoapps/courseware/views.py:get_course_lti_endpoints) + (see lms/djangoapps/courseware/views/views.py:get_course_lti_endpoints) b.) GET, PUT and DELETE in LTI Result JSON binding (http://www.imsglobal.org/lti/ltiv2p0/mediatype/application/vnd/ims/lis/v2/result+json/index.html) for a provider to synchronize grades into edx-platform. Reading, Setting, and Deleteing diff --git a/docs/en_us/internal/overview.md b/docs/en_us/internal/overview.md index 9d5d729ca3..fad76ba30b 100644 --- a/docs/en_us/internal/overview.md +++ b/docs/en_us/internal/overview.md @@ -91,7 +91,7 @@ The LMS is a django site, with root in `lms/`. It runs in many different enviro - `lms/djangoapps/courseware/models.py` - Core rendering path: - - `lms/urls.py` points to `courseware.views.index`, which gets module info from the course xml file, pulls list of `StudentModule` objects for this user (to avoid multiple db hits). + - `lms/urls.py` points to `courseware.views.views.index`, which gets module info from the course xml file, pulls list of `StudentModule` objects for this user (to avoid multiple db hits). - Calls `render_accordion` to render the "accordion"--the display of the course structure. diff --git a/docs/en_us/platform_api/source/conf.py b/docs/en_us/platform_api/source/conf.py index 5cacb96b19..af7c8e42ef 100644 --- a/docs/en_us/platform_api/source/conf.py +++ b/docs/en_us/platform_api/source/conf.py @@ -44,7 +44,7 @@ MOCK_MODULES = [ 'courseware.access', 'courseware.model_data', 'courseware.module_render', - 'courseware.views', + 'courseware.views.views', 'util.request', 'eventtracking', 'xmodule', diff --git a/lms/djangoapps/branding/tests/test_page.py b/lms/djangoapps/branding/tests/test_page.py index 16fcd87c0c..af789bf88e 100644 --- a/lms/djangoapps/branding/tests/test_page.py +++ b/lms/djangoapps/branding/tests/test_page.py @@ -196,7 +196,7 @@ class IndexPageCourseCardsSortingTests(ModuleStoreTestCase): self.factory = RequestFactory() @patch('student.views.render_to_response', RENDER_MOCK) - @patch('courseware.views.render_to_response', RENDER_MOCK) + @patch('courseware.views.views.render_to_response', RENDER_MOCK) @patch.dict('django.conf.settings.FEATURES', {'ENABLE_COURSE_DISCOVERY': False}) def test_course_discovery_off(self): """ @@ -220,7 +220,7 @@ class IndexPageCourseCardsSortingTests(ModuleStoreTestCase): self.assertIn('
.*)$'.format( settings.COURSE_ID_PATTERN, ), - 'courseware.views.jump_to', + 'courseware.views.views.jump_to', name='jump_to', ), url( r'^courses/{}/jump_to_id/(?P.*)$'.format( settings.COURSE_ID_PATTERN, ), - 'courseware.views.jump_to_id', + 'courseware.views.views.jump_to_id', name='jump_to_id', ), @@ -318,7 +318,7 @@ urlpatterns += ( # Note: This is not an API. Compare this with the xblock_view API above. url( r'^xblock/{usage_key_string}$'.format(usage_key_string=settings.USAGE_KEY_PATTERN), - 'courseware.views.render_xblock', + 'courseware.views.views.render_xblock', name='render_xblock', ), @@ -362,7 +362,7 @@ urlpatterns += ( r'^courses/{}/about$'.format( settings.COURSE_ID_PATTERN, ), - 'courseware.views.course_about', + 'courseware.views.views.course_about', name='about_course', ), @@ -371,14 +371,14 @@ urlpatterns += ( r'^courses/{}/$'.format( settings.COURSE_ID_PATTERN, ), - 'courseware.views.course_info', + 'courseware.views.views.course_info', name='course_root', ), url( r'^courses/{}/info$'.format( settings.COURSE_ID_PATTERN, ), - 'courseware.views.course_info', + 'courseware.views.views.course_info', name='info', ), # TODO arjun remove when custom tabs in place, see courseware/courses.py @@ -386,7 +386,7 @@ urlpatterns += ( r'^courses/{}/syllabus$'.format( settings.COURSE_ID_PATTERN, ), - 'courseware.views.syllabus', + 'courseware.views.views.syllabus', name='syllabus', ), @@ -395,7 +395,7 @@ urlpatterns += ( r'^courses/{}/survey$'.format( settings.COURSE_ID_PATTERN, ), - 'courseware.views.course_survey', + 'courseware.views.views.course_survey', name='course_survey', ), @@ -492,7 +492,7 @@ urlpatterns += ( r'^courses/{}/progress$'.format( settings.COURSE_ID_PATTERN, ), - 'courseware.views.progress', + 'courseware.views.views.progress', name='progress', ), # Takes optional student_id for instructor use--shows profile as that student sees it. @@ -500,7 +500,7 @@ urlpatterns += ( r'^courses/{}/progress/(?P[^/]*)/$'.format( settings.COURSE_ID_PATTERN, ), - 'courseware.views.progress', + 'courseware.views.views.progress', name='student_progress', ), @@ -632,7 +632,7 @@ urlpatterns += ( r'^courses/{}/lti_rest_endpoints/'.format( settings.COURSE_ID_PATTERN, ), - 'courseware.views.get_course_lti_endpoints', + 'courseware.views.views.get_course_lti_endpoints', name='lti_rest_endpoints', ), @@ -697,7 +697,7 @@ urlpatterns += ( r'^courses/{}/generate_user_cert'.format( settings.COURSE_ID_PATTERN, ), - 'courseware.views.generate_user_cert', + 'courseware.views.views.generate_user_cert', name='generate_user_cert', ), ) @@ -750,7 +750,7 @@ urlpatterns += ( r'^courses/{}/(?P[^/]+)/$'.format( settings.COURSE_ID_PATTERN, ), - 'courseware.views.static_tab', + 'courseware.views.views.static_tab', name='static_tab', ), ) @@ -761,7 +761,7 @@ if settings.FEATURES.get('ENABLE_STUDENT_HISTORY_VIEW'): r'^courses/{}/submission_history/(?P[^/]*)/(?P.*?)$'.format( settings.COURSE_ID_PATTERN ), - 'courseware.views.submission_history', + 'courseware.views.views.submission_history', name='submission_history', ), ) @@ -994,17 +994,17 @@ if settings.FEATURES.get('ENABLE_FINANCIAL_ASSISTANCE_FORM'): urlpatterns += ( url( r'^financial-assistance/$', - 'courseware.views.financial_assistance', + 'courseware.views.views.financial_assistance', name='financial_assistance' ), url( r'^financial-assistance/apply/$', - 'courseware.views.financial_assistance_form', + 'courseware.views.views.financial_assistance_form', name='financial_assistance_form' ), url( r'^financial-assistance/submit/$', - 'courseware.views.financial_assistance_request', + 'courseware.views.views.financial_assistance_request', name='submit_financial_assistance_request' ) )