Merge pull request #323 from cmclaughlin/master

Automatically create UserProfiles
This commit is contained in:
David Buxton 2016-03-24 14:04:14 +00:00
commit 7344efa981
2 changed files with 9 additions and 5 deletions

View File

@ -1,4 +1,5 @@
from django.db import models from django.db import models
from django.db.models.signals import post_save
from django.conf import settings from django.conf import settings
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from polymorphic import PolymorphicModel from polymorphic import PolymorphicModel
@ -913,6 +914,11 @@ class UserProfile(models.Model):
hipchat_alias = models.CharField(max_length=50, blank=True, default='') hipchat_alias = models.CharField(max_length=50, blank=True, default='')
fallback_alert_user = models.BooleanField(default=False) fallback_alert_user = models.BooleanField(default=False)
def create_user_profile(sender, instance, created, **kwargs):
if created:
UserProfile.objects.create(user=instance)
post_save.connect(create_user_profile, sender=User)
class Shift(models.Model): class Shift(models.Model):
start = models.DateTimeField() start = models.DateTimeField()

View File

@ -23,7 +23,7 @@ from mock import Mock, patch
from cabot.cabotapp.models import ( from cabot.cabotapp.models import (
GraphiteStatusCheck, JenkinsStatusCheck, GraphiteStatusCheck, JenkinsStatusCheck,
HttpStatusCheck, ICMPStatusCheck, Service, Instance, HttpStatusCheck, ICMPStatusCheck, Service, Instance,
StatusCheckResult, UserProfile, minimize_targets) StatusCheckResult, minimize_targets)
from cabot.cabotapp.views import StatusCheckReportForm from cabot.cabotapp.views import StatusCheckReportForm
from cabot.cabotapp.alert import send_alert from cabot.cabotapp.alert import send_alert
from cabot.cabotapp.graphite import parse_metric from cabot.cabotapp.graphite import parse_metric
@ -877,10 +877,8 @@ class TestAlerts(LocalTestCase):
def setUp(self): def setUp(self):
super(TestAlerts, self).setUp() super(TestAlerts, self).setUp()
self.user_profile = UserProfile.objects.create( self.user.profile.hipchat_alias = "test_user_hipchat_alias"
user = self.user, self.user.profile.save()
hipchat_alias = "test_user_hipchat_alias",)
self.user_profile.save()
self.service.users_to_notify.add(self.user) self.service.users_to_notify.add(self.user)
self.service.update_status() self.service.update_status()