Merge pull request #871 from edx/fix/cdodge/re-enable-enrollment-start-stop

due to the MixedModuleStore pending release, we need to make enrollment ...

cms/djangoapps/contentstore/tests/test_course_settings.py

@@ -123,8 +123,8 @@ class CourseDetailsTestCase(CourseTestCase):
 
             self.assertContains(response, "Course Start Date")
             self.assertContains(response, "Course End Date")
-            self.assertNotContains(response, "Enrollment Start Date")
-            self.assertNotContains(response, "Enrollment End Date")
+            self.assertContains(response, "Enrollment Start Date")
+            self.assertContains(response, "Enrollment End Date")
             self.assertContains(response, "not the dates shown on your course summary page")
 
             self.assertNotContains(response, "Introducing Your Course")

cms/envs/common.py

@@ -55,7 +55,7 @@ MITX_FEATURES = {
 
     # If set to True, new Studio users won't be able to author courses unless
     # edX has explicitly added them to the course creator group.
-    'ENABLE_CREATOR_GROUP': False
+    'ENABLE_CREATOR_GROUP': False,
 }
 ENABLE_JASMINE = False
 

cms/templates/settings.html

@@ -152,7 +152,6 @@ from contentstore import utils
             </li>
           </ol>
 
-          % if about_page_editable:
           <ol class="list-input">
             <li class="field-group field-group-enrollment-start" id="enrollment-start">
               <div class="field date" id="field-enrollment-start-date">
@@ -182,7 +181,6 @@ from contentstore import utils
               </div>
             </li>
           </ol>
-          % endif
 
           % if not about_page_editable:
           <div class="notice notice-incontext notice-workflow">