From f15b3f345e2d1f60109b31a2b277a148d31f7a8a Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Thu, 28 Aug 2014 19:07:22 -0400 Subject: [PATCH] Review updates --- data/model/legacy.py | 8 ++++---- static/js/app.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/model/legacy.py b/data/model/legacy.py index 52248958c..242e8030a 100644 --- a/data/model/legacy.py +++ b/data/model/legacy.py @@ -330,8 +330,8 @@ def add_or_invite_to_team(inviter, team, user=None, email=None): add_user_to_team(user, team) return None - return TeamMemberInvite.create(user=user, email=email if not user else None, team=team, - inviter=inviter) + email_address = email if not user else None + return TeamMemberInvite.create(user=user, email=email_address, team=team, inviter=inviter) def add_user_to_team(user, team): @@ -1775,9 +1775,9 @@ def delete_matching_notifications(target, kind_name, **kwargs): kind_ref = NotificationKind.get(name=kind_name) # Load all notifications for the user with the given kind. - notifications = list(Notification.select().where( + notifications = Notification.select().where( Notification.target == target, - Notification.kind == kind_ref)) + Notification.kind == kind_ref) # For each, match the metadata to the specified values. for notification in notifications: diff --git a/static/js/app.js b/static/js/app.js index e17e36e6f..78f543e5a 100644 --- a/static/js/app.js +++ b/static/js/app.js @@ -2649,7 +2649,7 @@ quayApp.directive('logsView', function () { 'org_remove_team_member': 'Remove member {member} from team {team}', 'org_invite_team_member': 'Invite user {member} to team {team}', - 'org_team_member_invite_accepted': 'User {member}, invited by {inviter}, accepted to join team {team}', + 'org_team_member_invite_accepted': 'User {member}, invited by {inviter}, joined team {team}', 'org_team_member_invite_declined': 'User {member}, invited by {inviter}, declined to join team {team}', 'org_set_team_description': 'Change description of team {team}: {description}',