vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Review updates

Browse source
This commit is contained in:
Joseph Schorr 2014-08-28 19:07:22 -04:00
parent 7ca853adee
commit f15b3f345e
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
data/model/legacy.py
View file

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

2
static/js/app.js
View file

@ -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}',