Merge branch 'course-info' into feature/dhm/cms-settings

Conflicts: cms/djangoapps/contentstore/views.py
2012-11-19 16:00:27 -05:00
parent 8c8be3e82a 842bbe92d1
commit a9233dfd44
11 changed files with 61 additions and 17 deletions
--- a/common/test/data/graded/course.xml
+++ b/common/test/data/graded/course.xml
@@ -1 +0,0 @@
-roots/2012_Fall.xml
--- a/common/test/data/graded/course.xml
+++ b/common/test/data/graded/course.xml
@@ -0,0 +1 @@
+<course org="edX" course="graded" url_name="2012_Fall"/>
--- a/common/test/data/self_assessment/course.xml
+++ b/common/test/data/self_assessment/course.xml
@@ -1 +0,0 @@
-roots/2012_Fall.xml
--- a/common/test/data/self_assessment/course.xml
+++ b/common/test/data/self_assessment/course.xml
@@ -0,0 +1 @@
+<course org="edX" course="sa_test" url_name="2012_Fall"/>
--- a/common/test/data/test_start_date/course.xml
+++ b/common/test/data/test_start_date/course.xml
@@ -1 +0,0 @@
-roots/2012_Fall.xml
--- a/common/test/data/test_start_date/course.xml
+++ b/common/test/data/test_start_date/course.xml
@@ -0,0 +1 @@
+<course org="edX" course="test_start_date" url_name="2012_Fall"/>
--- a/common/test/data/toy/course.xml
+++ b/common/test/data/toy/course.xml
@@ -1 +0,0 @@
-roots/2012_Fall.xml
--- a/common/test/data/toy/course.xml
+++ b/common/test/data/toy/course.xml
@@ -0,0 +1 @@
+<course org="edX" course="toy" url_name="2012_Fall"/>
				`@@ -0,0 +1 @@`
				`<course org="edX" course="graded" url_name="2012_Fall"/>`
				`@@ -0,0 +1 @@`
				`<course org="edX" course="sa_test" url_name="2012_Fall"/>`
				`@@ -0,0 +1 @@`
				`<course org="edX" course="test_start_date" url_name="2012_Fall"/>`
				`@@ -0,0 +1 @@`
				`<course org="edX" course="toy" url_name="2012_Fall"/>`