-
- ${editor}
-
-
Save
-
Cancel
+
+
-${preview}
\ No newline at end of file
+${preview}
+
diff --git a/cms/templates/overview.html b/cms/templates/overview.html
index 2a46908c55..a20531200e 100644
--- a/cms/templates/overview.html
+++ b/cms/templates/overview.html
@@ -122,7 +122,7 @@
% for section in sections:
diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py
index f8e18a9355..4d3b2b1e00 100644
--- a/common/lib/xmodule/xmodule/course_module.py
+++ b/common/lib/xmodule/xmodule/course_module.py
@@ -6,6 +6,7 @@ from xmodule.modulestore import Location
from xmodule.seq_module import SequenceDescriptor, SequenceModule
from xmodule.timeparse import parse_time, stringify_time
from xmodule.util.decorators import lazyproperty
+from datetime import datetime
import json
import logging
import requests
@@ -18,6 +19,8 @@ log = logging.getLogger(__name__)
edx_xml_parser = etree.XMLParser(dtd_validation=False, load_dtd=False,
remove_comments=True, remove_blank_text=True)
+_cached_toc = {}
+
class CourseDescriptor(SequenceDescriptor):
module_class = SequenceModule
@@ -50,6 +53,24 @@ class CourseDescriptor(SequenceDescriptor):
"""
toc_url = self.book_url + 'toc.xml'
+ # cdodge: I've added this caching of TOC because in Mongo-backed instances (but not Filesystem stores)
+ # course modules have a very short lifespan and are constantly being created and torn down.
+ # Since this module in the __init__() method does a synchronous call to AWS to get the TOC
+ # this is causing a big performance problem. So let's be a bit smarter about this and cache
+ # each fetch and store in-mem for 10 minutes.
+ # NOTE: I have to get this onto sandbox ASAP as we're having runtime failures. I'd like to swing back and
+ # rewrite to use the traditional Django in-memory cache.
+ try:
+ # see if we already fetched this
+ if toc_url in _cached_toc:
+ (table_of_contents, timestamp) = _cached_toc[toc_url]
+ age = datetime.now() - timestamp
+ # expire every 10 minutes
+ if age.seconds < 600:
+ return table_of_contents
+ except Exception as err:
+ pass
+
# Get the table of contents from S3
log.info("Retrieving textbook table of contents from %s" % toc_url)
try:
@@ -62,6 +83,7 @@ class CourseDescriptor(SequenceDescriptor):
# TOC is XML. Parse it
try:
table_of_contents = etree.fromstring(r.text)
+ _cached_toc[toc_url] = (table_of_contents, datetime.now())
except Exception as err:
msg = 'Error %s: Unable to parse XML for textbook table of contents at %s' % (err, toc_url)
log.error(msg)
diff --git a/common/lib/xmodule/xmodule/modulestore/__init__.py b/common/lib/xmodule/xmodule/modulestore/__init__.py
index 2a47b26eaa..3de55dbc6c 100644
--- a/common/lib/xmodule/xmodule/modulestore/__init__.py
+++ b/common/lib/xmodule/xmodule/modulestore/__init__.py
@@ -284,7 +284,7 @@ class ModuleStore(object):
"""
raise NotImplementedError
- def get_items(self, location, depth=0):
+ def get_items(self, location, course_id=None, depth=0):
"""
Returns a list of XModuleDescriptor instances for the items
that match location. Any element of location that is None is treated
diff --git a/common/lib/xmodule/xmodule/modulestore/mongo.py b/common/lib/xmodule/xmodule/modulestore/mongo.py
index c65c031c9a..cdd8076431 100644
--- a/common/lib/xmodule/xmodule/modulestore/mongo.py
+++ b/common/lib/xmodule/xmodule/modulestore/mongo.py
@@ -262,7 +262,7 @@ class MongoModuleStore(ModuleStoreBase):
"""
return self.get_item(location)
- def get_items(self, location, depth=0):
+ def get_items(self, location, course_id=None, depth=0):
items = self.collection.find(
location_to_query(location),
sort=[('revision', pymongo.ASCENDING)],
diff --git a/common/lib/xmodule/xmodule/modulestore/xml.py b/common/lib/xmodule/xmodule/modulestore/xml.py
index b7f1b0da02..47a9ec282e 100644
--- a/common/lib/xmodule/xmodule/modulestore/xml.py
+++ b/common/lib/xmodule/xmodule/modulestore/xml.py
@@ -513,16 +513,22 @@ class XMLModuleStore(ModuleStoreBase):
raise NotImplementedError("XMLModuleStores can't guarantee that definitions"
" are unique. Use get_instance.")
- def get_items(self, location, depth=0):
+ def get_items(self, location, course_id=None, depth=0):
items = []
- for _, modules in self.modules.iteritems():
- for mod_loc, module in modules.iteritems():
+ def _add_get_items(self, location, modules):
+ for mod_loc, module in modules.iteritems():
# Locations match if each value in `location` is None or if the value from `location`
# matches the value from `mod_loc`
if all(goal is None or goal == value for goal, value in zip(location, mod_loc)):
items.append(module)
+ if course_id is None:
+ for _, modules in self.modules.iteritems():
+ _add_get_items(self, location, modules)
+ else:
+ _add_get_items(self, location, self.modules[course_id])
+
return items
diff --git a/common/lib/xmodule/xmodule/modulestore/xml_importer.py b/common/lib/xmodule/xmodule/modulestore/xml_importer.py
index 35375d7c51..2fd70f68cd 100644
--- a/common/lib/xmodule/xmodule/modulestore/xml_importer.py
+++ b/common/lib/xmodule/xmodule/modulestore/xml_importer.py
@@ -120,47 +120,16 @@ def import_from_xml(store, data_dir, course_dirs=None,
course_data_path = None
course_location = None
- # Quick scan to get course Location as well as the course_data_path
+
+ # Quick scan to get course module as we need some info from there. Also we need to make sure that the
+ # course module is committed first into the store
for module in module_store.modules[course_id].itervalues():
if module.category == 'course':
course_data_path = path(data_dir) / module.metadata['data_dir']
course_location = module.location
- if static_content_store is not None:
- _namespace_rename = target_location_namespace if target_location_namespace is not None else module_store.modules[course_id].location
-
- # first pass to find everything in /static/
- import_static_content(module_store.modules[course_id], course_location, course_data_path, static_content_store,
- _namespace_rename, subpath='static')
+ module = remap_namespace(module, target_location_namespace)
- for module in module_store.modules[course_id].itervalues():
-
- # remap module to the new namespace
- if target_location_namespace is not None:
- # This looks a bit wonky as we need to also change the 'name' of the imported course to be what
- # the caller passed in
- if module.location.category != 'course':
- module.location = module.location._replace(tag=target_location_namespace.tag, org=target_location_namespace.org,
- course=target_location_namespace.course)
- else:
- module.location = module.location._replace(tag=target_location_namespace.tag, org=target_location_namespace.org,
- course=target_location_namespace.course, name=target_location_namespace.name)
-
- # then remap children pointers since they too will be re-namespaced
- children_locs = module.definition.get('children')
- if children_locs is not None:
- new_locs = []
- for child in children_locs:
- child_loc = Location(child)
- new_child_loc = child_loc._replace(tag=target_location_namespace.tag, org=target_location_namespace.org,
- course=target_location_namespace.course)
-
- new_locs.append(new_child_loc.url())
-
- module.definition['children'] = new_locs
-
-
- if module.category == 'course':
# HACK: for now we don't support progress tabs. There's a special metadata configuration setting for this.
module.metadata['hide_progress_tab'] = True
@@ -174,12 +143,41 @@ def import_from_xml(store, data_dir, course_dirs=None,
{"type": "discussion", "name": "Discussion"},
{"type": "wiki", "name": "Wiki"}] # note, add 'progress' when we can support it on Edge
+
+ store.update_item(module.location, module.definition['data'])
+ if 'children' in module.definition:
+ store.update_children(module.location, module.definition['children'])
+ store.update_metadata(module.location, dict(module.own_metadata))
+
# a bit of a hack, but typically the "course image" which is shown on marketing pages is hard coded to /images/course_image.jpg
# so let's make sure we import in case there are no other references to it in the modules
verify_content_links(module, course_data_path, static_content_store, '/static/images/course_image.jpg')
course_items.append(module)
+
+
+ # then import all the static content
+ if static_content_store is not None:
+ _namespace_rename = target_location_namespace if target_location_namespace is not None else module_store.modules[course_id].location
+
+ # first pass to find everything in /static/
+ import_static_content(module_store.modules[course_id], course_location, course_data_path, static_content_store,
+ _namespace_rename, subpath='static')
+
+ # finally loop through all the modules
+ for module in module_store.modules[course_id].itervalues():
+
+ if module.category == 'course':
+ # we've already saved the course module up at the top of the loop
+ # so just skip over it in the inner loop
+ continue
+
+ # remap module to the new namespace
+ if target_location_namespace is not None:
+ module = remap_namespace(module, target_location_namespace)
+
+
if 'data' in module.definition:
module_data = module.definition['data']
@@ -216,6 +214,33 @@ def import_from_xml(store, data_dir, course_dirs=None,
return module_store, course_items
+def remap_namespace(module, target_location_namespace):
+ if target_location_namespace is None:
+ return module
+
+ # This looks a bit wonky as we need to also change the 'name' of the imported course to be what
+ # the caller passed in
+ if module.location.category != 'course':
+ module.location = module.location._replace(tag=target_location_namespace.tag, org=target_location_namespace.org,
+ course=target_location_namespace.course)
+ else:
+ module.location = module.location._replace(tag=target_location_namespace.tag, org=target_location_namespace.org,
+ course=target_location_namespace.course, name=target_location_namespace.name)
+
+ # then remap children pointers since they too will be re-namespaced
+ children_locs = module.definition.get('children')
+ if children_locs is not None:
+ new_locs = []
+ for child in children_locs:
+ child_loc = Location(child)
+ new_child_loc = child_loc._replace(tag=target_location_namespace.tag, org=target_location_namespace.org,
+ course=target_location_namespace.course)
+
+ new_locs.append(new_child_loc.url())
+
+ module.definition['children'] = new_locs
+
+ return module
def validate_category_hierarcy(module_store, course_id, parent_category, expected_child_category):
err_cnt = 0
diff --git a/common/static/js/vendor/timepicker/jquery.timepicker.css b/common/static/js/vendor/timepicker/jquery.timepicker.css
index ad6dae98b8..0586ef16c3 100755
--- a/common/static/js/vendor/timepicker/jquery.timepicker.css
+++ b/common/static/js/vendor/timepicker/jquery.timepicker.css
@@ -1,18 +1,17 @@
.ui-timepicker-list {
overflow-y: auto;
height: 150px;
- width: 7.5em;
+ width: 6.5em;
background: #fff;
- border: 1px solid #8891a1;
+ border: 1px solid #ddd;
margin: 0;
padding: 0;
list-style: none;
- -webkit-box-shadow: 0 5px 10px rgba(0,0,0,0.1);
- -moz-box-shadow: 0 5px 10px rgba(0,0,0,0.1);
- box-shadow: 0 5px 10px rgba(0,0,0,0.1);
+ -webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);
+ -moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);
+ box-shadow:0 5px 10px rgba(0,0,0,0.2);
outline: none;
- z-index: 100001;
- font-size: 12px;
+ z-index: 10001;
}
.ui-timepicker-list.ui-timepicker-with-duration {
diff --git a/common/static/js/vendor/timepicker/jquery.timepicker.js b/common/static/js/vendor/timepicker/jquery.timepicker.js
old mode 100755
new mode 100644
index 3a462dd436..fb35f99ed2
--- a/common/static/js/vendor/timepicker/jquery.timepicker.js
+++ b/common/static/js/vendor/timepicker/jquery.timepicker.js
@@ -2,16 +2,22 @@
jquery-timepicker
http://jonthornton.github.com/jquery-timepicker/
-requires jQuery 1.6+
-
-version: 1.2.2
+requires jQuery 1.7+
************************/
-!(function($)
-{
- var _baseDate = new Date(); _baseDate.setHours(0); _baseDate.setMinutes(0); _baseDate.setSeconds(0);
+(function (factory) {
+ if (typeof define === 'function' && define.amd) {
+ // AMD. Register as an anonymous module.
+ define(['jquery'], factory);
+ } else {
+ // Browser globals
+ factory(jQuery);
+ }
+}(function ($) {
+ var _baseDate = _generateBaseDate();
var _ONE_DAY = 86400;
+ var _closeEvent = 'ontouchstart' in document ? 'touchstart' : 'mousedown';
var _defaults = {
className: null,
minTime: null,
@@ -22,7 +28,9 @@ version: 1.2.2
timeFormat: 'g:ia',
scrollDefaultNow: false,
scrollDefaultTime: false,
- selectOnBlur: false
+ selectOnBlur: false,
+ forceRoundTime: false,
+ appendTo: 'body'
};
var _lang = {
decimal: '.',
@@ -30,6 +38,7 @@ version: 1.2.2
hr: 'hr',
hrs: 'hrs'
};
+ var globalInit = false;
var methods =
{
@@ -78,31 +87,45 @@ version: 1.2.2
self.data('timepicker-settings', settings);
self.attr('autocomplete', 'off');
- self.click(methods.show).focus(methods.show).blur(_formatValue).keydown(_keyhandler);
+ self.on('click.timepicker focus.timepicker', methods.show);
+ self.on('blur.timepicker', _formatValue);
+ self.on('keydown.timepicker', _keyhandler);
self.addClass('ui-timepicker-input');
- if (self.val()) {
- var prettyTime = _int2time(_time2int(self.val()), settings.timeFormat);
- self.val(prettyTime);
+ _formatValue.call(self.get(0));
+
+ if (!globalInit) {
+ // close the dropdown when container loses focus
+ $('body').on(_closeEvent, function(e) {
+ var target = $(e.target);
+ var input = target.closest('.ui-timepicker-input');
+ if (input.length === 0 && target.closest('.ui-timepicker-list').length === 0) {
+ methods.hide();
+ }
+ });
+ globalInit = true;
}
-
- // close the dropdown when container loses focus
- $("body").attr("tabindex", -1).focusin(function(e) {
- if ($(e.target).closest('.ui-timepicker-input').length == 0 && $(e.target).closest('.ui-timepicker-list').length == 0) {
- methods.hide();
- }
- });
-
});
},
show: function(e)
{
var self = $(this);
+
+ if ('ontouchstart' in document) {
+ // block the keyboard on mobile devices
+ self.blur();
+ }
+
var list = self.data('timepicker-list');
+ // check if input is readonly
+ if (self.attr('readonly')) {
+ return;
+ }
+
// check if list needs to be rendered
- if (!list || list.length == 0) {
+ if (!list || list.length === 0) {
_render(self);
list = self.data('timepicker-list');
}
@@ -121,16 +144,12 @@ version: 1.2.2
// make sure other pickers are hidden
methods.hide();
-
- var topMargin = parseInt(self.css('marginTop').slice(0, -2));
- if (!topMargin) topMargin = 0; // correct for IE returning "auto"
-
if ((self.offset().top + self.outerHeight(true) + list.outerHeight()) > $(window).height() + $(window).scrollTop()) {
// position the dropdown on top
- list.css({ 'left':(self.offset().left), 'top': self.offset().top + topMargin - list.outerHeight() });
+ list.css({ 'left':(self.offset().left), 'top': self.offset().top - list.outerHeight() });
} else {
// put it under the input
- list.css({ 'left':(self.offset().left), 'top': self.offset().top + topMargin + self.outerHeight() });
+ list.css({ 'left':(self.offset().left), 'top': self.offset().top + self.outerHeight() });
}
list.show();
@@ -140,13 +159,13 @@ version: 1.2.2
var selected = list.find('.ui-timepicker-selected');
if (!selected.length) {
- if (self.val()) {
- selected = _findRow(self, list, _time2int(self.val()));
- } else if (settings.minTime === null && settings.scrollDefaultNow) {
- selected = _findRow(self, list, _time2int(new Date()));
- } else if (settings.scrollDefaultTime !== false) {
- selected = _findRow(self, list, _time2int(settings.scrollDefaultTime));
- }
+ if (self.val()) {
+ selected = _findRow(self, list, _time2int(self.val()));
+ } else if (settings.scrollDefaultNow) {
+ selected = _findRow(self, list, _time2int(new Date()));
+ } else if (settings.scrollDefaultTime !== false) {
+ selected = _findRow(self, list, _time2int(settings.scrollDefaultTime));
+ }
}
if (selected && selected.length) {
@@ -165,7 +184,8 @@ version: 1.2.2
var list = $(this);
var self = list.data('timepicker-input');
var settings = self.data('timepicker-settings');
- if (settings.selectOnBlur) {
+
+ if (settings && settings.selectOnBlur) {
_selectValue(self);
}
@@ -226,8 +246,29 @@ version: 1.2.2
var self = $(this);
var prettyTime = _int2time(_time2int(value), self.data('timepicker-settings').timeFormat);
self.val(prettyTime);
- }
+ },
+ remove: function()
+ {
+ var self = $(this);
+
+ // check if this element is a timepicker
+ if (!self.hasClass('ui-timepicker-input')) {
+ return;
+ }
+
+ self.removeAttr('autocomplete', 'off');
+ self.removeClass('ui-timepicker-input');
+ self.removeData('timepicker-settings');
+ self.off('.timepicker');
+
+ // timepicker-list won't be present unless the user has interacted with this timepicker
+ if (self.data('timepicker-list')) {
+ self.data('timepicker-list').remove();
+ }
+
+ self.removeData('timepicker-list');
+ }
};
// private methods
@@ -251,7 +292,7 @@ version: 1.2.2
list.css({'display':'none', 'position': 'absolute' });
- if (settings.minTime !== null && settings.showDuration) {
+ if ((settings.minTime !== null || settings.durationTime !== null) && settings.showDuration) {
list.addClass('ui-timepicker-with-duration');
}
@@ -267,14 +308,14 @@ version: 1.2.2
for (var i=start; i <= end; i += settings.step*60) {
var timeInt = i%_ONE_DAY;
var row = $(' 9) ? hour : '0'+hour;
break;
@@ -532,7 +618,7 @@ version: 1.2.2
break;
case 's':
- var seconds = time.getSeconds();
+ seconds = time.getSeconds();
output += (seconds > 9) ? seconds : '0'+seconds;
break;
@@ -542,40 +628,42 @@ version: 1.2.2
}
return output;
- };
+ }
function _time2int(timeString)
{
- if (timeString == '') return null;
+ if (timeString === '') return null;
if (timeString+0 == timeString) return timeString;
if (typeof(timeString) == 'object') {
- timeString = timeString.getHours()+':'+timeString.getMinutes();
+ timeString = timeString.getHours()+':'+timeString.getMinutes()+':'+timeString.getSeconds();
}
var d = new Date(0);
- var time = timeString.toLowerCase().match(/(\d+)(?::(\d\d))?\s*([pa]?)/);
+ var time = timeString.toLowerCase().match(/(\d{1,2})(?::(\d{1,2}))?(?::(\d{2}))?\s*([pa]?)/);
if (!time) {
return null;
}
- var hour = parseInt(time[1]*1);
+ var hour = parseInt(time[1]*1, 10);
+ var hours;
- if (time[3]) {
+ if (time[4]) {
if (hour == 12) {
- var hours = (time[3] == 'p') ? 12 : 0;
+ hours = (time[4] == 'p') ? 12 : 0;
} else {
- var hours = (hour + (time[3] == 'p' ? 12 : 0));
+ hours = (hour + (time[4] == 'p' ? 12 : 0));
}
} else {
- var hours = hour;
+ hours = hour;
}
var minutes = ( time[2]*1 || 0 );
- return hours*3600 + minutes*60;
- };
+ var seconds = ( time[3]*1 || 0 );
+ return hours*3600 + minutes*60 + seconds;
+ }
// Plugin entry
$.fn.timepicker = function(method)
@@ -584,4 +672,4 @@ version: 1.2.2
else if(typeof method === "object" || !method) { return methods.init.apply(this, arguments); }
else { $.error("Method "+ method + " does not exist on jQuery.timepicker"); }
};
-})(jQuery);
\ No newline at end of file
+}));
diff --git a/common/static/js/vendor/timepicker/jquery.timepicker.min.js b/common/static/js/vendor/timepicker/jquery.timepicker.min.js
index 1678150ab1..53f80af4b2 100755
--- a/common/static/js/vendor/timepicker/jquery.timepicker.min.js
+++ b/common/static/js/vendor/timepicker/jquery.timepicker.min.js
@@ -1 +1 @@
-!function(e){function o(t){var r=t.data("timepicker-settings"),i=t.data("timepicker-list");i&&i.length&&(i.remove(),t.data("timepicker-list",!1)),i=e(""),i.attr("tabindex",-1),i.addClass("ui-timepicker-list"),r.className&&i.addClass(r.className),i.css({display:"none",position:"absolute"}),r.minTime!==null&&r.showDuration&&i.addClass("ui-timepicker-with-duration");var s=r.durationTime!==null?r.durationTime:r.minTime,o=r.minTime!==null?r.minTime:0,u=r.maxTime!==null?r.maxTime:o+n-1;u<=o&&(u+=n);for(var f=o;f<=u;f+=r.step*60){var l=f%n,d=e("0)return i=e(n),!1}),i.addClass("ui-timepicker-selected")}else i.is(":last-child")||(i.removeClass("ui-timepicker-selected"),i.next().addClass("ui-timepicker-selected"),i.next().position().top+2*i.outerHeight()>r.outerHeight()&&r.scrollTop(r.scrollTop()+i.outerHeight()));break;case 27:r.find("li").removeClass("ui-timepicker-selected"),r.hide();break;case 9:case 16:case 17:case 18:case 19:case 20:case 33:case 34:case 35:case 36:case 37:case 39:case 45:return;default:r.find("li").removeClass("ui-timepicker-selected");return}}function c(e){var t=e.data("timepicker-settings"),n=e.data("timepicker-list"),r=null,i=n.find(".ui-timepicker-selected");if(i.length)var r=i.data("time");else if(e.val()){var r=d(e.val());a(e,n)}if(r!==null){var s=p(r,t.timeFormat);e.attr("value",s)}e.trigger("change").trigger("changeTime")}function h(e){var t=Math.round(e/60),n;if(t<60)n=[t,i.mins];else if(t==60)n=["1",i.hr];else{var r=(t/60).toFixed(1);i.decimal!="."&&(r=r.replace(".",i.decimal)),n=[r,i.hrs]}return n.join(" ")}function p(e,n){var r=new Date(t.valueOf()+e*1e3),i="";for(var s=0;s11?"pm":"am";break;case"A":i+=r.getHours()>11?"PM":"AM";break;case"g":var u=r.getHours()%12;i+=u==0?"12":u;break;case"G":i+=r.getHours();break;case"h":var u=r.getHours()%12;u!=0&&u<10&&(u="0"+u),i+=u==0?"12":u;break;case"H":var u=r.getHours();i+=u>9?u:"0"+u;break;case"i":var a=r.getMinutes();i+=a>9?a:"0"+a;break;case"s":var e=r.getSeconds();i+=e>9?e:"0"+e;break;default:i+=o}}return i}function d(e){if(e=="")return null;if(e+0==e)return e;typeof e=="object"&&(e=e.getHours()+":"+e.getMinutes());var t=new Date(0),n=e.toLowerCase().match(/(\d+)(?::(\d\d))?\s*([pa]?)/);if(!n)return null;var r=parseInt(n[1]*1);if(n[3])if(r==12)var i=n[3]=="p"?12:0;else var i=r+(n[3]=="p"?12:0);else var i=r;var s=n[2]*1||0;return i*3600+s*60}var t=new Date;t.setHours(0),t.setMinutes(0),t.setSeconds(0);var n=86400,r={className:null,minTime:null,maxTime:null,durationTime:null,step:30,showDuration:!1,timeFormat:"g:ia",scrollDefaultNow:!1,scrollDefaultTime:!1,selectOnBlur:!1},i={decimal:".",mins:"mins",hr:"hr",hrs:"hrs"},s={init:function(t){return this.each(function(){var n=e(this);if(n[0].tagName=="SELECT"){var o=e("e(window).height()+e(window).scrollTop()?r.css({left:n.offset().left,top:n.offset().top+i-r.outerHeight()}):r.css({left:n.offset().left,top:n.offset().top+i+n.outerHeight()}),r.show();var a=n.data("timepicker-settings"),f=r.find(".ui-timepicker-selected");f.length||(n.val()?f=u(n,r,d(n.val())):a.minTime===null&&a.scrollDefaultNow?f=u(n,r,d(new Date)):a.scrollDefaultTime!==!1&&(f=u(n,r,d(a.scrollDefaultTime))));if(f&&f.length){var l=r.scrollTop()+f.position().top-f.outerHeight();r.scrollTop(l)}else r.scrollTop(0);n.trigger("showTimepicker")},hide:function(t){e(".ui-timepicker-list:visible").each(function(){var t=e(this),n=t.data("timepicker-input"),r=n.data("timepicker-settings");r.selectOnBlur&&c(n),t.hide(),n.trigger("hideTimepicker")})},option:function(t,n){var r=e(this),i=r.data("timepicker-settings"),s=r.data("timepicker-list");if(typeof t=="object")i=e.extend(i,t);else if(typeof t=="string"&&typeof n!="undefined")i[t]=n;else if(typeof t=="string")return i[t];i.minTime&&(i.minTime=d(i.minTime)),i.maxTime&&(i.maxTime=d(i.maxTime)),i.durationTime&&(i.durationTime=d(i.durationTime)),r.data("timepicker-settings",i),s&&(s.remove(),r.data("timepicker-list",!1))},getSecondsFromMidnight:function(){return d(e(this).val())},getTime:function(){return new Date(t.valueOf()+d(e(this).val())*1e3)},setTime:function(t){var n=e(this),r=p(d(t),n.data("timepicker-settings").timeFormat);n.val(r)}};e.fn.timepicker=function(t){if(s[t])return s[t].apply(this,Array.prototype.slice.call(arguments,1));if(typeof t=="object"||!t)return s.init.apply(this,arguments);e.error("Method "+t+" does not exist on jQuery.timepicker")}}(jQuery)
\ No newline at end of file
+(function(e){typeof define=="function"&&define.amd?define(["jquery"],e):e(jQuery)})(function(e){function a(t){var r=t.data("timepicker-settings"),i=t.data("timepicker-list");i&&i.length&&(i.remove(),t.data("timepicker-list",!1)),i=e(""),i.attr("tabindex",-1),i.addClass("ui-timepicker-list"),r.className&&i.addClass(r.className),i.css({display:"none",position:"absolute"}),(r.minTime!==null||r.durationTime!==null)&&r.showDuration&&i.addClass("ui-timepicker-with-duration");var s=r.durationTime!==null?r.durationTime:r.minTime,o=r.minTime!==null?r.minTime:0,u=r.maxTime!==null?r.maxTime:o+n-1;u<=o&&(u+=n);for(var a=o;a<=u;a+=r.step*60){var f=a%n,l=e("=r.step*30?n+=r.step*60-i:n-=i}var s=m(n,r.timeFormat);t.val(s)}function p(t){var n=e(this),r=n.data("timepicker-list");if(!r.is(":visible")){if(t.keyCode!=40)return!0;n.focus()}switch(t.keyCode){case 13:return d(n),u.hide.apply(this),t.preventDefault(),!1;case 38:var i=r.find(".ui-timepicker-selected");i.length?i.is(":first-child")||(i.removeClass("ui-timepicker-selected"),i.prev().addClass("ui-timepicker-selected"),i.prev().position().top0)return i=e(n),!1}),i.addClass("ui-timepicker-selected"));break;case 40:i=r.find(".ui-timepicker-selected"),i.length===0?(r.children().each(function(t,n){if(e(n).position().top>0)return i=e(n),!1}),i.addClass("ui-timepicker-selected")):i.is(":last-child")||(i.removeClass("ui-timepicker-selected"),i.next().addClass("ui-timepicker-selected"),i.next().position().top+2*i.outerHeight()>r.outerHeight()&&r.scrollTop(r.scrollTop()+i.outerHeight()));break;case 27:r.find("li").removeClass("ui-timepicker-selected"),r.hide();break;case 9:u.hide();break;case 16:case 17:case 18:case 19:case 20:case 33:case 34:case 35:case 36:case 37:case 39:case 45:return;default:r.find("li").removeClass("ui-timepicker-selected");return}}function d(e){var t=e.data("timepicker-settings"),n=e.data("timepicker-list"),r=null,i=n.find(".ui-timepicker-selected");i.length?r=i.data("time"):e.val()&&(r=g(e.val()),c(e,n));if(r!==null){var s=m(r,t.timeFormat);e.attr("value",s)}e.trigger("change").trigger("changeTime")}function v(e){var t=Math.round(e/60),n;if(Math.abs(t)<60)n=[t,s.mins];else if(t==60)n=["1",s.hr];else{var r=(t/60).toFixed(1);s.decimal!="."&&(r=r.replace(".",s.decimal)),n=[r,s.hrs]}return n.join(" ")}function m(e,n){if(e===null)return;var r=new Date(t.valueOf()+e*1e3),i="",s,o;for(var u=0;u11?"pm":"am";break;case"A":i+=r.getHours()>11?"PM":"AM";break;case"g":s=r.getHours()%12,i+=s===0?"12":s;break;case"G":i+=r.getHours();break;case"h":s=r.getHours()%12,s!==0&&s<10&&(s="0"+s),i+=s===0?"12":s;break;case"H":s=r.getHours(),i+=s>9?s:"0"+s;break;case"i":var a=r.getMinutes();i+=a>9?a:"0"+a;break;case"s":e=r.getSeconds(),i+=e>9?e:"0"+e;break;default:i+=o}}return i}function g(e){if(e==="")return null;if(e+0==e)return e;typeof e=="object"&&(e=e.getHours()+":"+e.getMinutes()+":"+e.getSeconds());var t=new Date(0),n=e.toLowerCase().match(/(\d{1,2})(?::(\d{1,2}))?(?::(\d{2}))?\s*([pa]?)/);if(!n)return null;var r=parseInt(n[1]*1,10),i;n[4]?r==12?i=n[4]=="p"?12:0:i=r+(n[4]=="p"?12:0):i=r;var s=n[2]*1||0,o=n[3]*1||0;return i*3600+s*60+o}var t=f(),n=86400,r="ontouchstart"in document?"touchstart":"mousedown",i={className:null,minTime:null,maxTime:null,durationTime:null,step:30,showDuration:!1,timeFormat:"g:ia",scrollDefaultNow:!1,scrollDefaultTime:!1,selectOnBlur:!1,forceRoundTime:!1,appendTo:"body"},s={decimal:".",mins:"mins",hr:"hr",hrs:"hrs"},o=!1,u={init:function(t){return this.each(function(){var n=e(this);if(n[0].tagName=="SELECT"){var a=e("e(window).height()+e(window).scrollTop()?r.css({left:n.offset().left,top:n.offset().top-r.outerHeight()}):r.css({left:n.offset().left,top:n.offset().top+n.outerHeight()}),r.show();var i=n.data("timepicker-settings"),s=r.find(".ui-timepicker-selected");s.length||(n.val()?s=l(n,r,g(n.val())):i.scrollDefaultNow?s=l(n,r,g(new Date)):i.scrollDefaultTime!==!1&&(s=l(n,r,g(i.scrollDefaultTime))));if(s&&s.length){var o=r.scrollTop()+s.position().top-s.outerHeight();r.scrollTop(o)}else r.scrollTop(0);n.trigger("showTimepicker")},hide:function(t){e(".ui-timepicker-list:visible").each(function(){var t=e(this),n=t.data("timepicker-input"),r=n.data("timepicker-settings");r&&r.selectOnBlur&&d(n),t.hide(),n.trigger("hideTimepicker")})},option:function(t,n){var r=e(this),i=r.data("timepicker-settings"),s=r.data("timepicker-list");if(typeof t=="object")i=e.extend(i,t);else if(typeof t=="string"&&typeof n!="undefined")i[t]=n;else if(typeof t=="string")return i[t];i.minTime&&(i.minTime=g(i.minTime)),i.maxTime&&(i.maxTime=g(i.maxTime)),i.durationTime&&(i.durationTime=g(i.durationTime)),r.data("timepicker-settings",i),s&&(s.remove(),r.data("timepicker-list",!1))},getSecondsFromMidnight:function(){return g(e(this).val())},getTime:function(){return new Date(t.valueOf()+g(e(this).val())*1e3)},setTime:function(t){var n=e(this),r=m(g(t),n.data("timepicker-settings").timeFormat);n.val(r)},remove:function(){var t=e(this);if(!t.hasClass("ui-timepicker-input"))return;t.removeAttr("autocomplete","off"),t.removeClass("ui-timepicker-input"),t.removeData("timepicker-settings"),t.off(".timepicker"),t.data("timepicker-list")&&t.data("timepicker-list").remove(),t.removeData("timepicker-list")}};e.fn.timepicker=function(t){if(u[t])return u[t].apply(this,Array.prototype.slice.call(arguments,1));if(typeof t=="object"||!t)return u.init.apply(this,arguments);e.error("Method "+t+" does not exist on jQuery.timepicker")}});
\ No newline at end of file
diff --git a/lms/djangoapps/django_comment_client/utils.py b/lms/djangoapps/django_comment_client/utils.py
index 71fc38c0e1..1f39ebfcfd 100644
--- a/lms/djangoapps/django_comment_client/utils.py
+++ b/lms/djangoapps/django_comment_client/utils.py
@@ -127,6 +127,7 @@ def sort_map_entries(category_map):
sort_map_entries(category_map["subcategories"][title])
category_map["children"] = [x[0] for x in sorted(things, key=lambda x: x[1]["sort_key"])]
+
def initialize_discussion_info(course):
global _DISCUSSIONINFO
@@ -134,32 +135,32 @@ def initialize_discussion_info(course):
return
course_id = course.id
- all_modules = get_full_modules()[course_id]
discussion_id_map = {}
-
unexpanded_category_map = defaultdict(list)
- for location, module in all_modules.items():
- if location.category == 'discussion':
- skip_module = False
- for key in ('id', 'discussion_category', 'for'):
- if key not in module.metadata:
- log.warning("Required key '%s' not in discussion %s, leaving out of category map" % (key, module.location))
- skip_module = True
+ # get all discussion models within this course_id
+ all_modules = modulestore().get_items(['i4x', course.location.org, course.location.course, 'discussion', None], course_id=course_id)
- if skip_module:
- continue
+ for module in all_modules:
+ skip_module = False
+ for key in ('id', 'discussion_category', 'for'):
+ if key not in module.metadata:
+ log.warning("Required key '%s' not in discussion %s, leaving out of category map" % (key, module.location))
+ skip_module = True
- id = module.metadata['id']
- category = module.metadata['discussion_category']
- title = module.metadata['for']
- sort_key = module.metadata.get('sort_key', title)
- category = " / ".join([x.strip() for x in category.split("/")])
- last_category = category.split("/")[-1]
- discussion_id_map[id] = {"location": location, "title": last_category + " / " + title}
- unexpanded_category_map[category].append({"title": title, "id": id,
- "sort_key": sort_key, "start_date": module.start})
+ if skip_module:
+ continue
+
+ id = module.metadata['id']
+ category = module.metadata['discussion_category']
+ title = module.metadata['for']
+ sort_key = module.metadata.get('sort_key', title)
+ category = " / ".join([x.strip() for x in category.split("/")])
+ last_category = category.split("/")[-1]
+ discussion_id_map[id] = {"location": module.location, "title": last_category + " / " + title}
+ unexpanded_category_map[category].append({"title": title, "id": id,
+ "sort_key": sort_key, "start_date": module.start})
category_map = {"entries": defaultdict(dict), "subcategories": defaultdict(dict)}
for category_path, entries in unexpanded_category_map.items():