Merge remote-tracking branch 'origin/master' into add_send_permission

This commit is contained in:
Nicholas Staples
2016-03-03 09:20:19 +00:00
20 changed files with 352 additions and 91 deletions

View File

@@ -132,3 +132,12 @@ class InvitedUser(object):
def has_permissions(self, permission):
return permission in self.permissions
def serialize(self):
return {'id': self.id,
'service': self.service,
'from_user': self.from_user,
'email_address': self.email_address,
'permissions': self.permissions,
'status': self.status
}