Merge pull request #1205 from MITx/bug/dhm/dec12

Bug/dhm/dec12

cms/djangoapps/contentstore/views.py

@@ -322,7 +322,7 @@ def edit_unit(request, location):
         'draft_preview_link': preview_lms_link,
         'published_preview_link': lms_link,
         'subsection': containing_subsection,
-        'release_date': get_date_display(datetime.fromtimestamp(time.mktime(containing_subsection.start))) if containing_subsection.start is not None else 'Unset',
+        'release_date': get_date_display(datetime.fromtimestamp(time.mktime(containing_subsection.start))) if containing_subsection.start is not None else None,
         'section': containing_section,
         'create_new_unit_template': Location('i4x', 'edx', 'templates', 'vertical', 'Empty'),
         'unit_state': unit_state,

cms/djangoapps/models/settings/course_faculty.py

-from xmodule.modulestore import Location
-class CourseFaculty:
-    def __init__(self, location):
-        if not isinstance(location, Location):
-            location = Location(location)
-        # course_location is used so that updates know where to get the relevant data
-        self.course_location = location
-        self.first_name = ""
-        self.last_name = ""
-        self.photo = None
-        self.bio = ""
-        
-        
-    @classmethod
-    def fetch(cls, course_location):
-        """
-        Fetch a list of faculty for the course
-        """
-        if not isinstance(course_location, Location):
-            course_location = Location(course_location)
-            
-        # Must always have at least one faculty member (possibly empty)
\ No newline at end of file

cms/djangoapps/models/settings/course_grading.py

@@ -237,7 +237,7 @@ class CourseGradingModel:
         # 5 hours 59 minutes 59 seconds => converted to iso format
         rawgrace = descriptor.metadata.get('graceperiod', None)
         if rawgrace:
-            parsedgrace = {str(key): val for (val, key) in re.findall('\s*(\d*)\s*(\w*)', rawgrace)}
+            parsedgrace = {str(key): val for (val, key) in re.findall('\s*(\d+)\s*(\w+)', rawgrace)}
             return parsedgrace
         else: return None
 

cms/templates/overview.html

@@ -111,7 +111,7 @@
         <input class="start-date date" type="text" name="start_date" value="" placeholder="MM/DD/YYYY" class="date" size='15' autocomplete="off"/>
         <input class="start-time time" type="text" name="start_time" value="" placeholder="HH:MM" class="time" size='10' autocomplete="off"/>
         <div class="description">
-          <p>On the date set above, this section – <strong class="section-name"></strong> – will be released to students along with the 5 subsections within it. Any units marked private will only be visible to admins.</p>
+          <p>On the date set above, this section – <strong class="section-name"></strong> – will be released to students. Any units marked private will only be visible to admins.</p>
         </div>
       </div>
       <a href="#" class="save-button">Save</a><a href="#" class="cancel-button">Cancel</a>

cms/templates/unit.html

@@ -81,7 +81,11 @@
               <p class="publish-draft-message">This is a draft of the published unit. To update the live version, you must <a href="#" class="publish-draft">replace it with this draft</a>.</p>
             </div>            
             <div class="row status">
-              <p>This unit is scheduled to be released to <strong>students</strong> on <strong>${release_date}</strong> with the subsection <a href="${reverse('edit_subsection', kwargs={'location': subsection.location})}">"${subsection.display_name}"</a></p>
+              <p>This unit is scheduled to be released to <strong>students</strong> 
+              % if release_date is not None:
+                  on <strong>${release_date}</strong>
+              % endif 
+              with the subsection <a href="${reverse('edit_subsection', kwargs={'location': subsection.location})}">"${subsection.display_name}"</a></p>
             </div>
             <div class="row unit-actions">
               <a href="#" class="delete-draft delete-button">Delete Draft</a>

common/djangoapps/util/converters.py

@@ -19,4 +19,6 @@ def jsdate_to_time(field):
         d=datetime.datetime(*map(int, re.split('[^\d]', field)[:6])) # stop after seconds. Debatable  
         return d.utctimetuple()
     elif isinstance(field, int) or isinstance(field, float):
-        return time.gmtime(field / 1000)
\ No newline at end of file
+        return time.gmtime(field / 1000)
+    elif isinstance(field, time.struct_time):
+        return field
\ No newline at end of file

common/lib/xmodule/xmodule/course_module.py

@@ -116,7 +116,6 @@ class CourseDescriptor(SequenceDescriptor):
                     "type" : "Lab",
                     "min_count" : 12,
                     "drop_count" : 2,
-                    "category" : "Labs",
                     "weight" : 0.15
                 },
                 {