Merge branch 'master' into celery-jobs

This commit is contained in:
Martyn Inglis
2016-02-25 12:06:53 +00:00
15 changed files with 328 additions and 2 deletions

View File

@@ -128,6 +128,16 @@ class NotificationStatusSchema(BaseSchema):
model = models.Notification
class InvitedUserSchema(BaseSchema):
class Meta:
model = models.InvitedUser
@validates('email_address')
def validate_to(self, value):
if not email_regex.match(value):
raise ValidationError('Invalid email')
user_schema = UserSchema()
user_schema_load_json = UserSchema(load_json=True)
users_schema = UserSchema(many=True)
@@ -153,3 +163,5 @@ job_email_template_notification_schema = JobEmailTemplateNotificationSchema()
notification_status_schema = NotificationStatusSchema()
notifications_status_schema = NotificationStatusSchema(many=True)
notification_status_schema_load_json = NotificationStatusSchema(load_json=True)
invited_user_schema = InvitedUserSchema()
invited_users_schema = InvitedUserSchema(many=True)