Merge pull request #1273 from MITx/fix/cdodge/filesystem-xml-fixes

Fix/cdodge/filesystem xml fixes

cms/djangoapps/contentstore/tests/tests.py

@@ -350,6 +350,21 @@ class ContentStoreTest(TestCase):
     def test_edit_unit_full(self):
         self.check_edit_unit('full')
 
+    def test_about_overrides(self):
+        '''
+        This test case verifies that a course can use specialized override for about data, e.g. /about/Fall_2012/effort.html 
+        while there is a base definition in /about/effort.html
+        '''
+        import_from_xml(modulestore(), 'common/test/data/', ['full'])
+        ms = modulestore('direct')
+        effort = ms.get_item(Location(['i4x','edX','full','about','effort', None]))
+        self.assertEqual(effort.definition['data'],'6 hours')
+
+        # this one should be in a non-override folder
+        effort = ms.get_item(Location(['i4x','edX','full','about','end_date', None]))
+        self.assertEqual(effort.definition['data'],'TBD')
+
+
     def test_clone_course(self):
         import_from_xml(modulestore(), 'common/test/data/', ['full'])
 

common/lib/xmodule/xmodule/modulestore/xml.py

@@ -444,14 +444,20 @@ class XMLModuleStore(ModuleStoreBase):
             log.debug('========> Done with course import from {0}'.format(course_dir))
             return course_descriptor
 
+
     def load_extra_content(self, system, course_descriptor, category, base_dir, course_dir, url_name):
-        if url_name:
-            path =  base_dir / url_name
 
-        if not os.path.exists(path):
-            path = base_dir
+        self._load_extra_content(system, course_descriptor, category, base_dir, course_dir)
+
+         # then look in a override folder based on the course run
+        if os.path.isdir(base_dir / url_name):
+            self._load_extra_content(system, course_descriptor, category, base_dir / url_name, course_dir)       
+
+
+    def _load_extra_content(self, system, course_descriptor, category, path, course_dir):
 
         for filepath in glob.glob(path/ '*'):
+            if not os.path.isdir(filepath):
                 with open(filepath) as f:
                     try:
                         html = f.read().decode('utf-8')

common/test/data/full/about/6.002_Spring_2012/effort.html

+6 hours
\ No newline at end of file

common/test/data/full/about/effort.html

+12 hours
\ No newline at end of file

common/test/data/full/about/end_date.html

+TBD
\ No newline at end of file