From d66e323d42c4a6f010f5d7555ad5d4a16fe88a53 Mon Sep 17 00:00:00 2001 From: Jeff LaJoie Date: Fri, 6 Jan 2017 08:10:31 -0500 Subject: [PATCH 1/2] TNL-6186 changes field used in CourseTeamMembership emit to be correct team_id and fixes tests --- lms/djangoapps/teams/models.py | 2 +- lms/djangoapps/teams/tests/test_models.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lms/djangoapps/teams/models.py b/lms/djangoapps/teams/models.py index 2c6b7249d0..21967f2127 100644 --- a/lms/djangoapps/teams/models.py +++ b/lms/djangoapps/teams/models.py @@ -263,5 +263,5 @@ class CourseTeamMembership(models.Model): membership.team.save() membership.save() emit_team_event('edx.team.activity_updated', membership.team.course_id, { - 'team_id': membership.team_id, + 'team_id': membership.team.team_id, }) diff --git a/lms/djangoapps/teams/tests/test_models.py b/lms/djangoapps/teams/tests/test_models.py index 1938852af2..ea820329c2 100644 --- a/lms/djangoapps/teams/tests/test_models.py +++ b/lms/djangoapps/teams/tests/test_models.py @@ -172,7 +172,7 @@ class TeamSignalsTest(EventTestMixin, SharedModuleStoreTestCase): self.assertGreater(now, team_membership.last_activity_at) self.assert_event_emitted( 'edx.team.activity_updated', - team_id=team.id, + team_id=team.team_id, ) else: self.assertEqual(team.last_activity_at, team_last_activity) From 982d56ca2489fede47240957ae30a94fb0ed1f54 Mon Sep 17 00:00:00 2001 From: Jeff LaJoie Date: Fri, 6 Jan 2017 08:11:12 -0500 Subject: [PATCH 2/2] added self to AUTHORS --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 7b9f399c83..cdac79c676 100644 --- a/AUTHORS +++ b/AUTHORS @@ -278,3 +278,4 @@ Casey Litton Jhony Avella Tanmay Mohapatra Brian Mesick +Jeff LaJoie