Merge pull request #8325 from beardeer/master

Merge pull request #8325 from beardeer/edx-platform
2015-06-04 11:45:15 -04:00
parent 8dfb774565 a4b4e27427
commit 4f45839211
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@@ -218,3 +218,4 @@ Andrew Dekker <simultech@gmail.com>
 Christopher Lee <clee@edx.org>
 Mushtaq Ali <mushtaque.ali@arbisoft.com>
 Colin Fredericks <colin.fredericks@gmail.com>
+Xiaolu Xiong <beardeer@gmail.com>
--- a/lms/djangoapps/courseware/model_data.py
+++ b/lms/djangoapps/courseware/model_data.py
@@ -544,7 +544,7 @@ class UserStateSummaryCache(DjangoOrmFieldCache):
        with them.

        Arguments:
-            fields (list of str): Field names to return values for
+            fields (list of :class:`~Field`): Fields to return values for
            xblocks (list of :class:`~XBlock`): XBlocks to load fields for
            aside_types (list of str): Asides to load field for (which annotate the supplied
                xblocks).