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
701eac33
Commit
701eac33
authored
May 29, 2014
by
Don Mitchell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
get_courses doesn't return ErrorDescriptor
parent
a2ce7033
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
common/lib/xmodule/xmodule/modulestore/mongo/base.py
+2
-1
common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
+4
-1
No files found.
common/lib/xmodule/xmodule/modulestore/mongo/base.py
View file @
701eac33
...
@@ -557,7 +557,7 @@ class MongoModuleStore(ModuleStoreWriteBase):
...
@@ -557,7 +557,7 @@ class MongoModuleStore(ModuleStoreWriteBase):
'''
'''
Returns a list of course descriptors.
Returns a list of course descriptors.
'''
'''
return
sum
(
base_list
=
sum
(
[
[
self
.
_load_items
(
self
.
_load_items
(
SlashSeparatedCourseKey
(
course
[
'_id'
][
'org'
],
course
[
'_id'
][
'course'
],
course
[
'_id'
][
'name'
]),
SlashSeparatedCourseKey
(
course
[
'_id'
][
'org'
],
course
[
'_id'
][
'course'
],
course
[
'_id'
][
'name'
]),
...
@@ -574,6 +574,7 @@ class MongoModuleStore(ModuleStoreWriteBase):
...
@@ -574,6 +574,7 @@ class MongoModuleStore(ModuleStoreWriteBase):
],
],
[]
[]
)
)
return
[
course
for
course
in
base_list
if
not
isinstance
(
course
,
ErrorDescriptor
)]
def
_find_one
(
self
,
location
):
def
_find_one
(
self
,
location
):
'''Look for a given location in the collection. If revision is not
'''Look for a given location in the collection. If revision is not
...
...
common/lib/xmodule/xmodule/modulestore/split_mongo/split.py
View file @
701eac33
...
@@ -70,6 +70,7 @@ from bson.objectid import ObjectId
...
@@ -70,6 +70,7 @@ from bson.objectid import ObjectId
from
xmodule.modulestore.split_mongo.mongo_connection
import
MongoConnection
from
xmodule.modulestore.split_mongo.mongo_connection
import
MongoConnection
from
xblock.core
import
XBlock
from
xblock.core
import
XBlock
from
xmodule.modulestore.loc_mapper_store
import
LocMapperStore
from
xmodule.modulestore.loc_mapper_store
import
LocMapperStore
from
xmodule.error_module
import
ErrorDescriptor
log
=
logging
.
getLogger
(
__name__
)
log
=
logging
.
getLogger
(
__name__
)
#==============================================================================
#==============================================================================
...
@@ -313,7 +314,9 @@ class SplitMongoModuleStore(ModuleStoreWriteBase):
...
@@ -313,7 +314,9 @@ class SplitMongoModuleStore(ModuleStoreWriteBase):
'structure'
:
entry
,
'structure'
:
entry
,
}
}
root
=
entry
[
'root'
]
root
=
entry
[
'root'
]
result
.
extend
(
self
.
_load_items
(
envelope
,
[
root
],
0
,
lazy
=
True
))
course_list
=
self
.
_load_items
(
envelope
,
[
root
],
0
,
lazy
=
True
)
if
not
isinstance
(
course_list
[
0
],
ErrorDescriptor
):
result
.
append
(
course_list
[
0
])
return
result
return
result
def
get_course
(
self
,
course_id
,
depth
=
None
):
def
get_course
(
self
,
course_id
,
depth
=
None
):
...
...
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