Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Also pass course_id when fetching memberships for user in team profile view.

Browse Source 
TNL-3053
This commit is contained in:
Usman Khalid
2015-08-13 23:13:16 +05:00
parent b9cf31f444
commit 08498bc283
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lms/djangoapps/teams/static/teams/js/spec/views/team_join_spec.js
View File

@@ -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

3
lms/djangoapps/teams/static/teams/js/views/team_join.js
View File

@@ -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;

1
lms/djangoapps/teams/static/teams/js/views/teams_tab.js
View File

@@ -290,6 +290,7 @@
});
var teamJoinView = new TeamJoinView(
{
courseID: courseID,
model: team,
teamsUrl: self.teamsUrl,
maxTeamSize: self.maxTeamSize,