From 08498bc283135034f8e61a0b9dfba100ba2aeaac Mon Sep 17 00:00:00 2001
From: Usman Khalid <2200617@gmail.com>
Date: Thu, 13 Aug 2015 23:13:16 +0500
Subject: [PATCH] Also pass course_id when fetching memberships for user in
 team profile view.

TNL-3053
---
 .../static/teams/js/spec/views/team_join_spec.js     | 12 +++++++++---
 .../teams/static/teams/js/views/team_join.js         |  3 ++-
 .../teams/static/teams/js/views/teams_tab.js         |  1 +
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/lms/djangoapps/teams/static/teams/js/spec/views/team_join_spec.js b/lms/djangoapps/teams/static/teams/js/spec/views/team_join_spec.js
index 62fed60abc..8ddad5ff64 100644
--- a/lms/djangoapps/teams/static/teams/js/spec/views/team_join_spec.js
+++ b/lms/djangoapps/teams/static/teams/js/spec/views/team_join_spec.js
@@ -1,7 +1,8 @@
 define([
     'underscore', 'common/js/spec_helpers/ajax_helpers', 'teams/js/models/team',
+    'teams/js/spec_helpers/team_spec_helpers',
     'teams/js/views/team_join'
-], function (_, AjaxHelpers, TeamModel, TeamJoinView) {
+], function (_, AjaxHelpers, TeamModel, TeamSpecHelpers, TeamJoinView) {
     'use strict';
     describe('TeamJoinView', function () {
         var createTeamsUrl,
@@ -61,6 +62,7 @@ define([
 
             var teamJoinView = new TeamJoinView(
                 {
+                    courseID: TeamSpecHelpers.testCourseID,
                     model: model,
                     teamsUrl: createTeamsUrl(teamId),
                     maxTeamSize: maxTeamSize,
@@ -91,7 +93,9 @@ define([
             AjaxHelpers.expectRequest(
                 requests,
                 'GET',
-                TEAMS_MEMBERSHIP_URL + '?' + $.param({"username": currentUsername})
+                TEAMS_MEMBERSHIP_URL + '?' + $.param({
+                    'username': currentUsername, 'course_id': TeamSpecHelpers.testCourseID
+                })
             );
 
             // current user is not a member of any team so we should see the Join Team button
@@ -134,7 +138,9 @@ define([
             AjaxHelpers.expectRequest(
                 requests,
                 'GET',
-                TEAMS_MEMBERSHIP_URL + '?' + $.param({"username": currentUsername})
+                TEAMS_MEMBERSHIP_URL + '?' + $.param({
+                    'username': currentUsername, 'course_id': TeamSpecHelpers.testCourseID
+                })
             );
 
             // current user is a member of another team so we should see the correct message
diff --git a/lms/djangoapps/teams/static/teams/js/views/team_join.js b/lms/djangoapps/teams/static/teams/js/views/team_join.js
index 7b5af9b219..524ebcc6bd 100644
--- a/lms/djangoapps/teams/static/teams/js/views/team_join.js
+++ b/lms/djangoapps/teams/static/teams/js/views/team_join.js
@@ -19,6 +19,7 @@ define(['backbone',
 
                initialize: function(options) {
                    this.template = _.template(teamJoinTemplate);
+                   this.courseID = options.courseID;
                    this.maxTeamSize = options.maxTeamSize;
                    this.currentUsername = options.currentUsername;
                    this.teamMembershipsUrl = options.teamMembershipsUrl;
@@ -85,7 +86,7 @@ define(['backbone',
                            $.ajax({
                                type: 'GET',
                                url: view.teamMembershipsUrl,
-                               data: {'username': username}
+                               data: {'username': username, 'course_id': view.courseID}
                            }).done(function (data) {
                                info.alreadyMember = (data.count > 0);
                                info.memberOfCurrentTeam = false;
diff --git a/lms/djangoapps/teams/static/teams/js/views/teams_tab.js b/lms/djangoapps/teams/static/teams/js/views/teams_tab.js
index d2c3c1b5bb..9cf96affe4 100644
--- a/lms/djangoapps/teams/static/teams/js/views/teams_tab.js
+++ b/lms/djangoapps/teams/static/teams/js/views/teams_tab.js
@@ -290,6 +290,7 @@
                                 });
                             var teamJoinView = new TeamJoinView(
                                 {
+                                    courseID: courseID,
                                     model: team,
                                     teamsUrl: self.teamsUrl,
                                     maxTeamSize: self.maxTeamSize,