Merge pull request #10554 from edx/release

Verifying release branch for release-2015-11-09

common/djangoapps/student/admin.py

@@ -136,8 +136,12 @@ class CourseEnrollmentAdmin(admin.ModelAdmin):
     """ Admin interface for the CourseEnrollment model. """
     list_display = ('id', 'course_id', 'mode', 'user', 'is_active',)
     list_filter = ('mode', 'is_active',)
+    raw_id_fields = ('user',)
     search_fields = ('course_id', 'mode', 'user__username',)
 
+    def queryset(self, request):
+        return super(CourseEnrollmentAdmin, self).queryset(request).select_related('user')
+
     class Meta(object):
         model = CourseEnrollment
 
@@ -145,6 +149,7 @@ class CourseEnrollmentAdmin(admin.ModelAdmin):
 class UserProfileAdmin(admin.ModelAdmin):
     """ Admin interface for UserProfile model. """
     list_display = ('user', 'name',)
+    raw_id_fields = ('user',)
     search_fields = ('user__username', 'user__first_name', 'user__last_name', 'user__email', 'name',)
 
     def get_readonly_fields(self, request, obj=None):

common/lib/xmodule/xmodule/js/spec/capa/display_spec.coffee

@@ -538,19 +538,6 @@ describe 'Problem', ->
       runs ->
         expect(window.SR.readElts).toHaveBeenCalled()
 
-    it 'disables check button while posting', ->
-      runs ->
-        spyOn($, 'postWithPrefix').andCallFake (url, answers, callback) -> callback(success: 'OK')
-        spyOn @problem, 'enableCheckButton'
-        @problem.save()
-        expect(@problem.enableCheckButton).toHaveBeenCalledWith false
-      waitsFor (->
-        return jQuery.active == 0
-      ), "jQuery requests finished", 1000
-
-      runs ->
-        expect(@problem.enableCheckButton).toHaveBeenCalledWith true
-
   describe 'refreshMath', ->
     beforeEach ->
       @problem = new Problem($('.xblock-student_view'))

common/lib/xmodule/xmodule/js/src/capa/display.coffee

@@ -412,13 +412,11 @@ class @Problem
       @save_internal()
 
   save_internal: =>
-    @enableCheckButton false
     Logger.log 'problem_save', @answers
     $.postWithPrefix "#{@url}/problem_save", @answers, (response) =>
       saveMessage = response.msg
       @gentle_alert saveMessage
       @updateProgress response
-      @enableCheckButton true
 
   refreshMath: (event, element) =>
     element = event.target unless element

common/static/js/vendor/draggabilly.pkgd.js

@@ -1748,7 +1748,14 @@ return Unidragger;
 
   if ( typeof define == 'function' && define.amd ) {
     // AMD
-    define( [
+    // Note: fixed by andy-armstrong to include a name for the definition
+    // so that this works when optimized using r.js. This is only an issue
+    // in Studio, as the LMS uses a namespaced version of RequireJS so
+    // this clause isn't reached.
+    // See http://requirejs.org/docs/errors.html#mismatch
+    define(
+      'draggabilly',
+      [
         'classie/classie',
         'get-style-property/get-style-property',
         'get-size/get-size',