Merge branch 'master' into feature/abarrett/annotatable_xmodule

common/lib/capa/capa/responsetypes.py

@@ -632,8 +632,12 @@ class MultipleChoiceResponse(LoncapaResponse):
 
         # define correct choices (after calling secondary setup)
         xml = self.xml
-        cxml = xml.xpath('//*[@id=$id]//choice[@correct="true"]', id=xml.get('id'))
-        self.correct_choices = [contextualize_text(choice.get('name'), self.context) for choice in cxml]
+        cxml = xml.xpath('//*[@id=$id]//choice', id=xml.get('id'))
+        # contextualize correct attribute and then select ones for which
+        # correct = "true"
+        self.correct_choices = [contextualize_text(choice.get('name'), self.context)
+            for choice in cxml
+            if contextualize_text(choice.get('correct'), self.context) == "true"]
 
     def mc_setup_response(self):
         '''

common/lib/xmodule/xmodule/course_module.py

@@ -446,7 +446,7 @@ class CourseDescriptor(SequenceDescriptor):
         # utility function to get datetime objects for dates used to
         # compute the is_new flag and the sorting_score
         def to_datetime(timestamp):
-            return datetime.fromtimestamp(time.mktime(timestamp))
+            return datetime(*timestamp[:6])
 
         def get_date(field):
             timetuple = self._try_parse_time(field)

common/lib/xmodule/xmodule/templates.py

@@ -56,6 +56,10 @@ def update_templates():
     available from the installed plugins
     """
 
+    # cdodge: build up a list of all existing templates. This will be used to determine which
+    # templates have been removed from disk - and thus we need to remove from the DB
+    templates_to_delete = modulestore('direct').get_items(['i4x', 'edx', 'templates', None, None, None])
+
     for category, templates in all_templates().items():
         for template in templates:
             if 'display_name' not in template.metadata:
@@ -85,3 +89,12 @@ def update_templates():
             modulestore('direct').update_item(template_location, template.data)
             modulestore('direct').update_children(template_location, template.children)
             modulestore('direct').update_metadata(template_location, template.metadata)
+
+            # remove template from list of templates to delete
+            templates_to_delete = [t for t in templates_to_delete if t.location != template_location]
+
+    # now remove all templates which appear to have removed from disk
+    if len(templates_to_delete) > 0:
+        logging.debug('deleting dangling templates = {0}'.format(templates_to_delete))
+        for template in templates_to_delete:
+            modulestore('direct').delete_item(template.location)

common/lib/xmodule/xmodule/timelimit_module.py

@@ -86,8 +86,8 @@ class TimeLimitModule(XModule):
         modified_duration = self._get_accommodated_duration(duration)
         self.ending_at = self.beginning_at + modified_duration
         
-    def get_end_time_in_ms(self):
-        return int(self.ending_at * 1000)
+    def get_remaining_time_in_ms(self):
+        return int((self.ending_at - time()) * 1000)
 
     def get_instance_state(self):
         state = {}