Merge branch 'feature/cas/speed-editor' into feature/christina/tiny-mce

cms/djangoapps/contentstore/features/studio-overview-togglesection.feature

@@ -21,12 +21,12 @@ Feature: Overview Toggle Section
 		Then I see the "Collapse All Sections" link
 		And all sections are expanded
 
-	Scenario: Collapse link is removed after last section of a course is deleted
+	Scenario: Collapse link is not removed after last section of a course is deleted
 		Given I have a course with 1 section
 		And I navigate to the course overview page
 	    When I press the "section" delete icon
 	    And I confirm the alert
-		Then I do not see the "Collapse All Sections" link
+		Then I see the "Collapse All Sections" link
 
 	Scenario: Collapsing all sections when all sections are expanded
 		Given I navigate to the courseware page of a course with multiple sections

cms/djangoapps/contentstore/views.py

@@ -475,7 +475,7 @@ def preview_module_system(request, preview_id, descriptor):
     )
 
 
-def get_preview_module(request, preview_id, location):
+def get_preview_module(request, preview_id, descriptor):
     """
     Returns a preview XModule at the specified location. The preview_data is chosen arbitrarily
     from the set of preview data for the descriptor specified by Location
@@ -484,7 +484,6 @@ def get_preview_module(request, preview_id, location):
     preview_id (str): An identifier specifying which preview this module is used for
     location: A Location
     """
-    descriptor = modulestore().get_item(location)
     instance_state, shared_state = descriptor.get_sample_state()[0]
     return load_preview_module(request, preview_id, descriptor, instance_state, shared_state)
 

cms/static/coffee/src/views/module_edit.coffee

@@ -55,7 +55,7 @@ class CMS.Views.ModuleEdit extends Backbone.View
   clickSaveButton: (event) =>
     event.preventDefault()
     data = @module.save()
-    data.metadata = _.extend(data.metadata, @metadata())
+    data.metadata = _.extend(data.metadata || {}, @metadata())
     @hideModal()
     @model.save(data).done( =>
     #   # showToastMessage("Your changes have been saved.", null, 3)

cms/templates/widgets/problem-edit.html

@@ -14,9 +14,13 @@
                         class="problem-editor-icon number"></span></a></li>
                 <li><a href="#" class="dropdown-button" data-tooltip="Option Response"><span
                         class="problem-editor-icon dropdown"></span></a></li>
+                <li><a href="#" class="header-button" data-tooltip="Header"><span
+                        class="problem-editor-icon dropdown"></span></a></li>
+                <li><a href="#" class="explanation-button" data-tooltip="Explanation (aka Solution)"><span
+                        class="problem-editor-icon dropdown"></span></a></li>
             </ul>
             <ul class="editor-tabs">
-                <li><a href="#" class="xml-tab tab" data-tab="xml">Use Advanced Editor</a></li>
+                <li><a href="#" class="xml-tab tab advanced-toggle" data-tab="xml">Advanced Editor</a></li>
                 <li><a href="#" class="cheatsheet-toggle" data-tooltip="Toggle Cheatsheet">?</a></li>
             </ul>
         </div>
@@ -30,6 +34,17 @@
     <article class="simple-editor-cheatsheet">
         <div class="cheatsheet-wrapper">
             <div class="row">
+                <h6>Header</h6>
+                <div class="col sample">
+                    <img src="/static/img/header-example.png" />
+                </div>
+                <div class="col">
+<pre><code>H1
+=====
+</pre>
+                </div>
+            </div>
+            <div class="row">
                 <h6>Multiple Choice</h6>
                 <div class="col sample">
                     <img src="/static/img/choice-example.png" />
@@ -78,6 +93,18 @@
                     <pre><code>[[wrong, (right)]]</code></pre>
                 </div>
             </div>
+            <div class="row">
+                <h6>Explanation</h6>
+                <div class="col sample">
+                    <img src="/static/img/explanation-example.png" />
+                </div>
+                <div class="col">
+<pre><code>[explanation]
+A short explanation of the answer.
+[explanation]
+</code></pre>
+                </div>
+            </div>
         </div>
     </article>
 </script>

common/lib/xmodule/xmodule/abtest_module.py

@@ -52,9 +52,10 @@ class ABTestModule(XModule):
     def get_shared_state(self):
         return json.dumps({'group': self.group})
     
-    def get_children_locations(self):
-        return self.definition['data']['group_content'][self.group]
-        
+    def get_child_descriptors(self):
+        active_locations = set(self.definition['data']['group_content'][self.group])
+        return [desc for desc in self.descriptor.get_children() if desc.location.url() in active_locations]
+
     def displayable_items(self):
         # Most modules return "self" as the displayable_item. We never display ourself
         # (which is why we don't implement get_html). We only display our children.

common/lib/xmodule/xmodule/css/problem/edit.scss

@@ -45,11 +45,32 @@
       }
     }
 
+    .advanced-toggle {
+      @include white-button;
+      height: auto;
+      margin-top: -1px;
+      padding: 3px 9px;
+      font-size: 12px;
+
+      &.current {
+        border: 1px solid $lightGrey !important;
+        border-radius: 3px !important;
+        background: $lightGrey !important;
+        color: $darkGrey !important;
+        pointer-events: none;
+        cursor: none;
+        
+        &:hover {
+          box-shadow: 0 0 0 0 !important;
+        }
+      }
+    }
+
     .cheatsheet-toggle {
       width: 21px;
       height: 21px;
       padding: 0;
-      margin: 3px 5px 0 16px;
+      margin: 0 5px 0 15px;
       border-radius: 22px;
       border: 1px solid #a5aaaf;
       background: #e5ecf3;

common/lib/xmodule/xmodule/js/spec/problem/edit_spec.coffee

@@ -70,6 +70,22 @@ describe 'MarkdownEditingDescriptor', ->
       revisedSelection = MarkdownEditingDescriptor.insertSelect('my text')
       expect(revisedSelection).toEqual('[[my text]]')
 
+  describe 'insertHeader', ->
+    it 'inserts the template if selection is empty', ->
+      revisedSelection = MarkdownEditingDescriptor.insertHeader('')
+      expect(revisedSelection).toEqual(MarkdownEditingDescriptor.headerTemplate)
+    it 'wraps existing text', ->
+      revisedSelection = MarkdownEditingDescriptor.insertHeader('my text')
+      expect(revisedSelection).toEqual('my text\n====\n')
+
+  describe 'insertExplanation', ->
+    it 'inserts the template if selection is empty', ->
+      revisedSelection = MarkdownEditingDescriptor.insertExplanation('')
+      expect(revisedSelection).toEqual(MarkdownEditingDescriptor.explanationTemplate)
+    it 'wraps existing text', ->
+      revisedSelection = MarkdownEditingDescriptor.insertExplanation('my text')
+      expect(revisedSelection).toEqual('[explanation]\nmy text\n[explanation]')
+
   describe 'markdownToXml', ->
     it 'converts raw text to paragraph', ->
       data = MarkdownEditingDescriptor.markdownToXml('foo')
@@ -257,8 +273,6 @@ describe 'MarkdownEditingDescriptor', ->
         [(] distractor
         [] no space
         
-        {{video abcd1s}}
-        
         Option with multiple correct ones
         [[one option, (correct one), (should not be correct)]]
         
@@ -312,8 +326,6 @@ describe 'MarkdownEditingDescriptor', ->
           </choicegroup>
         </multiplechoiceresponse>
         
-        <video youtube="1.0:abcd1s" />
-        
         <p>Option with multiple correct ones</p>
         
         <optionresponse>

common/lib/xmodule/xmodule/js/src/problem/edit.coffee

 class @MarkdownEditingDescriptor extends XModule.Descriptor
+  # TODO really, these templates should come from or also feed the cheatsheet
   @multipleChoiceTemplate : "( ) incorrect\n( ) incorrect\n(x) correct\n"
   @checkboxChoiceTemplate: "[x] correct\n[ ] incorrect\n[x] correct\n"
   @stringInputTemplate: "= answer\n"
   @numberInputTemplate: "= answer +- x%\n"
   @selectTemplate: "[[incorrect, (correct), incorrect]]\n"
+  @headerTemplate: "Header\n=====\n"
+  @explanationTemplate: "[explanation]\nShort explanation\n[explanation]\n"
 
   constructor: (element) ->
     @element = element
@@ -59,7 +62,7 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor
   ###
   confirmConversionToXml: ->
     # TODO: use something besides a JavaScript confirm dialog?
-    return confirm("If you convert to the XML source representation, which is used by the Advanced Editor, you cannot go back to using the Simple Editor.\n\nProceed with conversion to XML?")
+    return confirm("If you use the Advanced Editor, this problem will be converted to XML and you will not be able to return to the Simple Editor Interface.\n\nProceed to the Advanced Editor and convert this problem to XML?")
 
   ###
   Event listener for toolbar buttons (only possible when markdown editor is visible).
@@ -74,6 +77,8 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor
       when "number-button" then revisedSelection = MarkdownEditingDescriptor.insertNumberInput(selection)
       when "checks-button" then revisedSelection = MarkdownEditingDescriptor.insertCheckboxChoice(selection)
       when "dropdown-button" then revisedSelection = MarkdownEditingDescriptor.insertSelect(selection)
+      when "header-button" then revisedSelection = MarkdownEditingDescriptor.insertHeader(selection)
+      when "explanation-button" then revisedSelection = MarkdownEditingDescriptor.insertExplanation(selection)
       else # ignore click
 
     if revisedSelection != null
@@ -158,6 +163,12 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor
   @insertSelect: (selectedText) ->
     return MarkdownEditingDescriptor.insertGenericInput(selectedText, '[[', ']]', MarkdownEditingDescriptor.selectTemplate)
 
+  @insertHeader: (selectedText) ->
+    return MarkdownEditingDescriptor.insertGenericInput(selectedText, '', '\n====\n', MarkdownEditingDescriptor.headerTemplate)
+
+  @insertExplanation: (selectedText) ->
+    return MarkdownEditingDescriptor.insertGenericInput(selectedText, '[explanation]\n', '\n[explanation]', MarkdownEditingDescriptor.explanationTemplate)
+
   @insertGenericInput: (selectedText, lineStart, lineEnd, template) ->
     if selectedText.length > 0
       # TODO: should this insert a newline afterwards?
@@ -165,7 +176,7 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor
     else
       return template
 
-# We may wish to add insertHeader and insertVideo. Here is Tom's code.
+# We may wish to add insertHeader. Here is Tom's code.
 # function makeHeader() {
 #  var selection = simpleEditor.getSelection();
 #  var revisedSelection = selection + '\n';
@@ -175,11 +186,6 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor
 #  simpleEditor.replaceSelection(revisedSelection);
 #}
 #
-#function makeVideo() {
-#var selection = simpleEditor.getSelection();
-#simpleEditor.replaceSelection('{{video ' + selection + '}}');
-#}
-#
   @markdownToXml: (markdown)->
     toXml = `function(markdown) {
       var xml = markdown;
@@ -222,9 +228,6 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor
         return groupString;
       });
 
-      // replace videos
-      xml = xml.replace(/\{\{video\s(.*?)\}\}/g, '<video youtube="1.0:$1" />\n\n');
-
       // replace string and numerical
       xml = xml.replace(/^\=\s*(.*?$)/gm, function(match, p) {
         var string;

common/lib/xmodule/xmodule/modulestore/__init__.py

@@ -265,7 +265,7 @@ class ModuleStore(object):
         """
         raise NotImplementedError
 
-    def get_instance(self, course_id, location):
+    def get_instance(self, course_id, location, depth=0):
         """
         Get an instance of this location, with policy for course_id applied.
         TODO (vshnayder): this may want to live outside the modulestore eventually

common/lib/xmodule/xmodule/modulestore/draft.py

@@ -59,15 +59,15 @@ class DraftModuleStore(ModuleStoreBase):
         except ItemNotFoundError:
             return wrap_draft(super(DraftModuleStore, self).get_item(location, depth))
 
-    def get_instance(self, course_id, location):
+    def get_instance(self, course_id, location, depth=0):
         """
         Get an instance of this location, with policy for course_id applied.
         TODO (vshnayder): this may want to live outside the modulestore eventually
         """
         try:
-            return wrap_draft(super(DraftModuleStore, self).get_instance(course_id, as_draft(location)))
+            return wrap_draft(super(DraftModuleStore, self).get_instance(course_id, as_draft(location), depth=depth))
         except ItemNotFoundError:
-            return wrap_draft(super(DraftModuleStore, self).get_instance(course_id, location))
+            return wrap_draft(super(DraftModuleStore, self).get_instance(course_id, location, depth=depth))
 
     def get_items(self, location, depth=0):
         """

common/lib/xmodule/xmodule/modulestore/mongo.py

@@ -82,17 +82,26 @@ def location_to_query(location, wildcard=True):
     If `wildcard` is True, then a None in a location is treated as a wildcard
     query. Otherwise, it is searched for literally
     """
-    query = SON()
-    # Location dict is ordered by specificity, and SON
-    # will preserve that order for queries
-    for key, val in Location(location).dict().iteritems():
-        if wildcard and val is None:
-            continue
-        query['_id.{key}'.format(key=key)] = val
+    query = namedtuple_to_son(Location(location), prefix='_id.')
+
+    if wildcard:
+        for key, value in query.items():
+            if value is None:
+                del query[key]
 
     return query
 
 
+def namedtuple_to_son(namedtuple, prefix=''):
+    """
+    Converts a namedtuple into a SON object with the same key order
+    """
+    son = SON()
+    for idx, field_name in enumerate(namedtuple._fields):
+        son[prefix + field_name] = namedtuple[idx]
+    return son
+
+
 class MongoModuleStore(ModuleStoreBase):
     """
     A Mongodb backed ModuleStore
@@ -149,6 +158,7 @@ class MongoModuleStore(ModuleStoreBase):
         If depth is None, will load all the children.
         This will make a number of queries that is linear in the depth.
         """
+
         data = {}
         to_process = list(items)
         while to_process and depth is None or depth >= 0:
@@ -162,8 +172,10 @@ class MongoModuleStore(ModuleStoreBase):
             # http://www.mongodb.org/display/DOCS/Advanced+Queries#AdvancedQueries-%24or
             # for or-query syntax
             if children:
-                to_process = list(self.collection.find(
-                    {'_id': {'$in': [Location(child).dict() for child in children]}}))
+                query = {
+                    '_id': {'$in': [namedtuple_to_son(Location(child)) for child in children]}
+                }
+                to_process = self.collection.find(query)
             else:
                 to_process = []
             # If depth is None, then we just recurse until we hit all the descendents
@@ -255,12 +267,17 @@ class MongoModuleStore(ModuleStoreBase):
         item = self._find_one(location)
         return self._load_items([item], depth)[0]
 
-    def get_instance(self, course_id, location):
+    def get_instance(self, course_id, location, depth=0):
         """
         TODO (vshnayder): implement policy tracking in mongo.
         For now, just delegate to get_item and ignore policy.
+
+        depth (int): An argument that some module stores may use to prefetch
+            descendents of the queried modules for more efficient results later
+            in the request. The depth is counted in the number of
+            calls to get_children() to cache. None indicates to cache all descendents.
         """
-        return self.get_item(location)
+        return self.get_item(location, depth=depth)
 
     def get_items(self, location, course_id=None, depth=0):
         items = self.collection.find(

common/lib/xmodule/xmodule/template_module.py

@@ -61,7 +61,7 @@ class CustomTagDescriptor(RawDescriptor):
         # cdodge: look up the template as a module
         template_loc = self.location._replace(category='custom_tag_template', name=template_name)
 
-        template_module = modulestore().get_instance(system.course_id, template_loc)
+        template_module = self.system.load_item(template_loc)
         template_module_data = template_module.definition['data']
         template = Template(template_module_data)
         return template.render(**params)

common/lib/xmodule/xmodule/x_module.py

@@ -241,17 +241,17 @@ class XModule(HTMLSnippet):
         Return module instances for all the children of this module.
         '''
         if self._loaded_children is None:
-            child_locations = self.get_children_locations()
-            children = [self.system.get_module(loc) for loc in child_locations]
+            child_descriptors = self.get_child_descriptors()
+            children = [self.system.get_module(descriptor) for descriptor in child_descriptors]
             # get_module returns None if the current user doesn't have access
             # to the location.
             self._loaded_children = [c for c in children if c is not None]
 
         return self._loaded_children
 
-    def get_children_locations(self):
+    def get_child_descriptors(self):
         '''
-        Returns the locations of each of child modules.
+        Returns the descriptors of the child modules
 
         Overriding this changes the behavior of get_children and
         anything that uses get_children, such as get_display_items.
@@ -262,7 +262,16 @@ class XModule(HTMLSnippet):
         These children will be the same children returned by the
         descriptor unless descriptor.has_dynamic_children() is true.
         '''
-        return self.definition.get('children', [])
+        return self.descriptor.get_children()
+
+    def get_child_by(self, selector):
+        """
+        Return a child XModuleDescriptor with the specified url_name, if it exists, and None otherwise.
+        """
+        for child in self.get_children():
+            if selector(child):
+                return child
+        return None
 
     def get_display_items(self):
         '''
@@ -577,13 +586,13 @@ class XModuleDescriptor(Plugin, HTMLSnippet, ResourceTemplates):
 
         return self._child_instances
 
-    def get_child_by_url_name(self, url_name):
+    def get_child_by(self, selector):
         """
         Return a child XModuleDescriptor with the specified url_name, if it exists, and None otherwise.
         """
-        for c in self.get_children():
-            if c.url_name == url_name:
-                return c
+        for child in self.get_children():
+            if selector(child):
+                return child
         return None
 
     def xmodule_constructor(self, system):
@@ -847,7 +856,7 @@ class ModuleSystem(object):
                          TODO: Not used, and has inconsistent args in different
                          files.  Update or remove.
 
-        get_module - function that takes (location) and returns a corresponding
+        get_module - function that takes a descriptor and returns a corresponding
                          module instance object.  If the current user does not have
                          access to that location, returns None.
 

lms/djangoapps/courseware/courses.py

@@ -42,28 +42,31 @@ def get_request_for_thread():
         del frame
 
 
-def get_course_by_id(course_id):
+def get_course_by_id(course_id, depth=0):
     """
     Given a course id, return the corresponding course descriptor.
 
     If course_id is not valid, raises a 404.
+    depth: The number of levels of children for the modulestore to cache. None means infinite depth
     """
     try:
         course_loc = CourseDescriptor.id_to_location(course_id)
-        return modulestore().get_instance(course_id, course_loc)
+        return modulestore().get_instance(course_id, course_loc, depth=depth)
     except (KeyError, ItemNotFoundError):
         raise Http404("Course not found.")
 
 
-def get_course_with_access(user, course_id, action):
+def get_course_with_access(user, course_id, action, depth=0):
     """
     Given a course_id, look up the corresponding course descriptor,
     check that the user has the access to perform the specified action
     on the course, and return the descriptor.
 
     Raises a 404 if the course_id is invalid, or the user doesn't have access.
+
+    depth: The number of levels of children for the modulestore to cache. None means infinite depth
     """
-    course = get_course_by_id(course_id)
+    course = get_course_by_id(course_id, depth=depth)
     if not has_access(user, course, action):
         # Deliberately return a non-specific error message to avoid
         # leaking info about access control settings

lms/djangoapps/courseware/grades.py

@@ -36,8 +36,7 @@ def yield_dynamic_descriptor_descendents(descriptor, module_creator):
     def get_dynamic_descriptor_children(descriptor):
         if descriptor.has_dynamic_children():
             module = module_creator(descriptor)
-            child_locations = module.get_children_locations()
-            return [descriptor.system.load_item(child_location) for child_location in child_locations ]
+            return module.get_child_descriptors()
         else:
             return descriptor.get_children()
     
@@ -291,7 +290,7 @@ def progress_summary(student, request, course, student_module_cache):
             graded = section_module.metadata.get('graded', False)
             scores = []
             
-            module_creator = lambda descriptor : section_module.system.get_module(descriptor.location)
+            module_creator = section_module.system.get_module
             
             for module_descriptor in yield_dynamic_descriptor_descendents(section_module.descriptor, module_creator):
                 

lms/djangoapps/courseware/module_render.py

@@ -82,7 +82,8 @@ def toc_for_course(user, request, course, active_chapter, active_section):
 
     student_module_cache = StudentModuleCache.cache_for_descriptor_descendents(
         course.id, user, course, depth=2)
-    course_module = get_module(user, request, course.location, student_module_cache, course.id)
+    course_module = get_module_for_descriptor(user, request, course,
+                                              student_module_cache, course.id)
     if course_module is None:
         return None
 
@@ -115,7 +116,9 @@ def toc_for_course(user, request, course, active_chapter, active_section):
     return chapters
 
 
-def get_module(user, request, location, student_module_cache, course_id, position=None, not_found_ok = False, wrap_xmodule_display = True):
+def get_module(user, request, location, student_module_cache, course_id,
+               position=None, not_found_ok=False, wrap_xmodule_display=True,
+               depth=0):
     """
     Get an instance of the xmodule class identified by location,
     setting the state based on an existing StudentModule, or creating one if none
@@ -130,13 +133,19 @@ def get_module(user, request, location, student_module_cache, course_id, positio
       - course_id             : the course_id in the context of which to load module
       - position              : extra information from URL for user-specified
                                 position within module
+      - depth                 : number of levels of descendents to cache when loading this module.
+                                None means cache all descendents
 
     Returns: xmodule instance, or None if the user does not have access to the
     module.  If there's an error, will try to return an instance of ErrorModule
     if possible.  If not possible, return None.
     """
     try:
-        return _get_module(user, request, location, student_module_cache, course_id, position, wrap_xmodule_display)
+        location = Location(location)
+        descriptor = modulestore().get_instance(course_id, location, depth=depth)
+        return get_module_for_descriptor(user, request, descriptor, student_module_cache, course_id,
+                                         position=position, not_found_ok=not_found_ok,
+                                         wrap_xmodule_display=wrap_xmodule_display)
     except ItemNotFoundError:
         if not not_found_ok:
             log.exception("Error in get_module")
@@ -146,12 +155,20 @@ def get_module(user, request, location, student_module_cache, course_id, positio
         log.exception("Error in get_module")
         return None
 
-def _get_module(user, request, location, student_module_cache, course_id, position=None, wrap_xmodule_display = True):
+
+def get_module_for_descriptor(user, request, descriptor, student_module_cache, course_id,
+                              position=None, not_found_ok=False, wrap_xmodule_display=True):
+    """
+    Actually implement get_module. See docstring there for details.
+    """
+    return _get_module(user, request, descriptor, student_module_cache, course_id,
+                       position=position, wrap_xmodule_display=wrap_xmodule_display)
+
+def _get_module(user, request, descriptor, student_module_cache, course_id,
+                position=None, wrap_xmodule_display=True):
     """
     Actually implement get_module.  See docstring there for details.
     """
-    location = Location(location)
-    descriptor = modulestore().get_instance(course_id, location)
 
     # Short circuit--if the user shouldn't have access, bail without doing any work
     if not has_access(user, descriptor, 'load', course_id):
@@ -206,12 +223,12 @@ def _get_module(user, request, location, student_module_cache, course_id, positi
               'waittime': settings.XQUEUE_WAITTIME_BETWEEN_REQUESTS
              }
 
-    def inner_get_module(location):
+    def inner_get_module(descriptor):
         """
         Delegate to get_module.  It does an access check, so may return None
         """
-        return get_module(user, request, location,
-                                       student_module_cache, course_id, position)
+        return get_module_for_descriptor(user, request, descriptor,
+                                         student_module_cache, course_id, position)
 
     # TODO (cpennington): When modules are shared between courses, the static
     # prefix is going to have to be specific to the module, not the directory
@@ -246,7 +263,7 @@ def _get_module(user, request, location, student_module_cache, course_id, positi
 
         # make an ErrorDescriptor -- assuming that the descriptor's system is ok
         import_system = descriptor.system
-        if has_access(user, location, 'staff', course_id):
+        if has_access(user, descriptor.location, 'staff', course_id):
             err_descriptor = ErrorDescriptor.from_xml(str(descriptor), import_system,
                                                       error_msg=exc_info_to_str(sys.exc_info()))
         else:

lms/djangoapps/courseware/views.py

@@ -20,7 +20,7 @@ from courseware.access import has_access
 from courseware.courses import (get_courses, get_course_with_access, get_courses_by_university)
 import courseware.tabs as tabs
 from courseware.models import StudentModuleCache
-from module_render import toc_for_course, get_module, get_instance_module
+from module_render import toc_for_course, get_module, get_instance_module, get_module_for_descriptor
 
 from django_comment_client.utils import get_discussion_title
 
@@ -180,7 +180,7 @@ def index(request, course_id, chapter=None, section=None,
 
      - HTTPresponse
     """
-    course = get_course_with_access(request.user, course_id, 'load')
+    course = get_course_with_access(request.user, course_id, 'load', depth=2)
     staff_access = has_access(request.user, course, 'staff')
     registered = registered_for_course(course, request.user)
     if not registered:
@@ -195,7 +195,8 @@ def index(request, course_id, chapter=None, section=None,
         # Has this student been in this course before?
         first_time = student_module_cache.lookup(course_id, 'course', course.location.url()) is None
 
-        course_module = get_module(request.user, request, course.location, student_module_cache, course.id)
+        # Load the module for the course
+        course_module = get_module_for_descriptor(request.user, request, course, student_module_cache, course.id)
         if course_module is None:
             log.warning('If you see this, something went wrong: if we got this'
                         ' far, should have gotten a course module for this user')
@@ -215,30 +216,28 @@ def index(request, course_id, chapter=None, section=None,
             'xqa_server': settings.MITX_FEATURES.get('USE_XQA_SERVER','http://xqa:server@content-qa.mitx.mit.edu/xqa')
             }
 
-        chapter_descriptor = course.get_child_by_url_name(chapter)
+        chapter_descriptor = course.get_child_by(lambda m: m.url_name == chapter)
         if chapter_descriptor is not None:
             instance_module = get_instance_module(course_id, request.user, course_module, student_module_cache)
             save_child_position(course_module, chapter, instance_module)
         else:
             raise Http404
 
-        chapter_module = get_module(request.user, request, chapter_descriptor.location,
-                                    student_module_cache, course_id)
+        chapter_module = course_module.get_child_by(lambda m: m.url_name == chapter)
         if chapter_module is None:
             # User may be trying to access a chapter that isn't live yet
             raise Http404
 
         if section is not None:
-            section_descriptor = chapter_descriptor.get_child_by_url_name(section)
+            section_descriptor = chapter_descriptor.get_child_by(lambda m: m.url_name == section)
             if section_descriptor is None:
                 # Specifically asked-for section doesn't exist
                 raise Http404
 
-            section_student_module_cache = StudentModuleCache.cache_for_descriptor_descendents(
-                course_id, request.user, section_descriptor)
-            section_module = get_module(request.user, request,
-                                section_descriptor.location,
-                                section_student_module_cache, course_id, position)
+            # Load all descendents of the section, because we're going to display it's
+            # html, which in general will need all of its children
+            section_module = get_module(request.user, request, section_descriptor.location,
+                                        student_module_cache, course.id, depth=None)
             if section_module is None:
                 # User may be trying to be clever and access something
                 # they don't have access to.