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
6f7bc7e1
Commit
6f7bc7e1
authored
May 23, 2014
by
Julia Hansbrough
Committed by
Sarina Canelake
May 24, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed some TODOs, removed irrelevant ones
parent
110719de
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
13 deletions
+11
-13
common/djangoapps/course_groups/models.py
+0
-1
lms/djangoapps/courseware/module_render.py
+3
-3
lms/djangoapps/courseware/tests/test_lti_integration.py
+1
-1
lms/djangoapps/courseware/tests/tests.py
+7
-8
No files found.
common/djangoapps/course_groups/models.py
View file @
6f7bc7e1
...
...
@@ -24,7 +24,6 @@ class CourseUserGroup(models.Model):
# Note: groups associated with particular runs of a course. E.g. Fall 2012 and Spring
# 2013 versions of 6.00x will have separate groups.
# TODO change field name to course_key
course_id
=
CourseKeyField
(
max_length
=
255
,
db_index
=
True
,
help_text
=
"Which course is this group associated with?"
)
...
...
lms/djangoapps/courseware/module_render.py
View file @
6f7bc7e1
...
...
@@ -60,9 +60,9 @@ XQUEUE_INTERFACE = XQueueInterface(
REQUESTS_AUTH
,
)
# TODO
basically all instances of course_id in this file *should* be changed to course_key, but
#
there's a couple tricky ones I'm too afraid to change before we merge the jellyfish branches.
#
This should be fixed after the jellyfish merge, before merge into master.
# TODO
: course_id and course_key are used interchangeably in this file, which is wrong.
#
Some brave person should make the variable names consistently someday, but the code's
#
coupled enough that it's kind of tricky--you've been warned!
class
LmsModuleRenderError
(
Exception
):
...
...
lms/djangoapps/courseware/tests/test_lti_integration.py
View file @
6f7bc7e1
...
...
@@ -39,7 +39,7 @@ class TestLTI(BaseTestXmodule):
mocked_signature_after_sign
=
u'my_signature
%3
D'
mocked_decoded_signature
=
u'my_signature='
#
TODO this course_id is actually a course_key; please change this ASAP!
#
Note: this course_id is actually a course_key
context_id
=
self
.
item_descriptor
.
course_id
.
to_deprecated_string
()
user_id
=
unicode
(
self
.
item_descriptor
.
xmodule_runtime
.
anonymous_student_id
)
hostname
=
self
.
item_descriptor
.
xmodule_runtime
.
hostname
...
...
lms/djangoapps/courseware/tests/tests.py
View file @
6f7bc7e1
...
...
@@ -48,8 +48,7 @@ class PageLoaderTestCase(LoginEnrollmentTestCase):
Base class that adds a function to load all pages in a modulestore.
"""
# TODO once everything is merged can someone please check whether this function takes a course_id or course_key
def
check_all_pages_load
(
self
,
course_id
):
def
check_all_pages_load
(
self
,
course_key
):
"""
Assert that all pages in the course load correctly.
`course_id` is the ID of the course to check.
...
...
@@ -58,11 +57,11 @@ class PageLoaderTestCase(LoginEnrollmentTestCase):
store
=
modulestore
()
# Enroll in the course before trying to access pages
course
=
store
.
get_course
(
course_
id
)
course
=
store
.
get_course
(
course_
key
)
self
.
enroll
(
course
,
True
)
# Search for items in the course
items
=
store
.
get_items
(
course_
id
)
items
=
store
.
get_items
(
course_
key
)
if
len
(
items
)
<
1
:
self
.
fail
(
'Could not retrieve any items from course'
)
...
...
@@ -72,21 +71,21 @@ class PageLoaderTestCase(LoginEnrollmentTestCase):
if
descriptor
.
location
.
category
==
'about'
:
self
.
_assert_loads
(
'about_course'
,
{
'course_id'
:
course_
id
.
to_deprecated_string
()},
{
'course_id'
:
course_
key
.
to_deprecated_string
()},
descriptor
)
elif
descriptor
.
location
.
category
==
'static_tab'
:
kwargs
=
{
'course_id'
:
course_
id
.
to_deprecated_string
(),
kwargs
=
{
'course_id'
:
course_
key
.
to_deprecated_string
(),
'tab_slug'
:
descriptor
.
location
.
name
}
self
.
_assert_loads
(
'static_tab'
,
kwargs
,
descriptor
)
elif
descriptor
.
location
.
category
==
'course_info'
:
self
.
_assert_loads
(
'info'
,
{
'course_id'
:
course_
id
.
to_deprecated_string
()},
self
.
_assert_loads
(
'info'
,
{
'course_id'
:
course_
key
.
to_deprecated_string
()},
descriptor
)
else
:
kwargs
=
{
'course_id'
:
course_
id
.
to_deprecated_string
(),
kwargs
=
{
'course_id'
:
course_
key
.
to_deprecated_string
(),
'location'
:
descriptor
.
location
.
to_deprecated_string
()}
self
.
_assert_loads
(
'jump_to'
,
kwargs
,
descriptor
,
...
...
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