Merge pull request #5083 from learningequality/0.16.x

0.16.2

data/version.yml

@@ -1,3 +1,14 @@
+0.16.2:
+  release_date: "2016/04/12"
+  git_commit: ""
+  new_features: []
+  bugs_fixed:
+    all:
+      - Fix attempt log filtering (#5082)
+    students: []
+    coaches: []
+    admins: []
+
 0.16.1:
   release_date: "2016/04/04"
   git_commit: ""

kalite/distributed/static/js/distributed/exercises/views.js

@@ -728,7 +728,7 @@ var ExercisePracticeView = ExerciseWrapperBaseView.extend({
     initialize_subviews: function() {
         this.exercise_view = this.add_subview(ExerciseView, {
             el: this.el,
-            exercise_id: this.options.data_model.get("exercise_id"),
+            exercise_id: this.options.data_model.get("id"),
             data_model: this.options.data_model,
             log_model: this.options.log_model
         });
@@ -749,7 +749,7 @@ var ExercisePracticeView = ExerciseWrapperBaseView.extend({
     load_user_data: function() {
 
         // load the last 10 (or however many) specific attempts the user made on this exercise
-        this.attempt_collection = new Models.AttemptLogCollection([], {exercise_id: this.options.data_model.get("exercise_id"), context_type__in: ["playlist", "exercise"]});
+        this.attempt_collection = new Models.AttemptLogCollection([], {exercise_id: this.options.data_model.get("id"), context_type__in: ["playlist", "exercise"]});
         var attempt_collection_deferred = this.attempt_collection.fetch();
 
         // wait until both the exercise and attempt logs have been loaded before continuing

kalite/version.py

@@ -7,7 +7,7 @@
 # Must also be of the form N.N.N for internal use, where N is a non-negative integer
 MAJOR_VERSION = "0"
 MINOR_VERSION = "16"
-PATCH_VERSION = "1"
+PATCH_VERSION = "2"
 VERSION = "%s.%s.%s" % (MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION)
 SHORTVERSION = "%s.%s" % (MAJOR_VERSION, MINOR_VERSION)