From afc5b47ebe7a1d9286de0c1353c4cacdf597b5ba Mon Sep 17 00:00:00 2001 From: AlasdairSwan Date: Thu, 28 Apr 2016 09:44:08 -0400 Subject: [PATCH] Renamed 'programId' to use 'id' --- lms/static/js/learner_dashboard/views/program_card_view.js | 2 +- .../js/spec/learner_dashboard/collection_list_view_spec.js | 4 ++-- .../js/spec/learner_dashboard/program_card_view_spec.js | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lms/static/js/learner_dashboard/views/program_card_view.js b/lms/static/js/learner_dashboard/views/program_card_view.js index ae5ac20965..761cd705ce 100644 --- a/lms/static/js/learner_dashboard/views/program_card_view.js +++ b/lms/static/js/learner_dashboard/views/program_card_view.js @@ -33,7 +33,7 @@ this.progressCollection = data.context.progressCollection; if ( this.progressCollection ) { this.progressModel = this.progressCollection.findWhere({ - programId: this.model.get('id') + id: this.model.get('id') }); } this.render(); diff --git a/lms/static/js/spec/learner_dashboard/collection_list_view_spec.js b/lms/static/js/spec/learner_dashboard/collection_list_view_spec.js index 9618d9da50..0cd6abd256 100644 --- a/lms/static/js/spec/learner_dashboard/collection_list_view_spec.js +++ b/lms/static/js/spec/learner_dashboard/collection_list_view_spec.js @@ -64,13 +64,13 @@ define([ ], userProgress: [ { - programId: 146, + id: 146, completed: ['courses', 'the', 'user', 'completed'], in_progress: ['in', 'progress'], not_started : ['courses', 'not', 'yet', 'started'] }, { - programId: 147, + id: 147, completed: ['Course 1'], in_progress: [], not_started: ['Course 2', 'Course 3', 'Course 4'] diff --git a/lms/static/js/spec/learner_dashboard/program_card_view_spec.js b/lms/static/js/spec/learner_dashboard/program_card_view_spec.js index e7b4466f55..c43f89f064 100644 --- a/lms/static/js/spec/learner_dashboard/program_card_view_spec.js +++ b/lms/static/js/spec/learner_dashboard/program_card_view_spec.js @@ -37,13 +37,13 @@ define([ }, userProgress = [ { - programId: 146, + id: 146, completed: ['courses', 'the', 'user', 'completed'], in_progress: ['in', 'progress'], not_started : ['courses', 'not', 'yet', 'started'] }, { - programId: 147, + id: 147, completed: ['Course 1'], in_progress: [], not_started: ['Course 2', 'Course 3', 'Course 4'] @@ -104,7 +104,7 @@ define([ }); it('should display the correct completed courses message', function() { - var program = _.findWhere(userProgress, {programId: 146}), + var program = _.findWhere(userProgress, {id: 146}), completed = program.completed.length, total = completed + program.in_progress.length + program.not_started.length;