Skip to content
Snippets Groups Projects
Commit b43bfc39 authored by Fabien Quatravaux's avatar Fabien Quatravaux
Browse files

update: move jabberID field from account.chat_profile to profile

parent 7b91dcb1
No related branches found
No related tags found
Loading
...@@ -64,12 +64,7 @@ class Profile(Model): ...@@ -64,12 +64,7 @@ class Profile(Model):
website = models.URLField(blank=True) website = models.URLField(blank=True)
address = models.ForeignKey(Address, on_delete=models.CASCADE, related_name="profile", blank=True, null=True) address = models.ForeignKey(Address, on_delete=models.CASCADE, related_name="profile", blank=True, null=True)
skills = models.ManyToManyField(Skill, blank=True) skills = models.ManyToManyField(Skill, blank=True)
jabberID = models.CharField(max_length=255, blank=True, null=True)
def jabberID(self):
try:
return self.user.chatProfile.jabberID
except:
return None
def name(self): def name(self):
try: try:
...@@ -125,7 +120,10 @@ class Profile(Model): ...@@ -125,7 +120,10 @@ class Profile(Model):
@receiver(post_save, sender=settings.AUTH_USER_MODEL) @receiver(post_save, sender=settings.AUTH_USER_MODEL)
def create_user_profile(sender, instance, created, **kwargs): def create_user_profile(sender, instance, created, **kwargs):
if created: if created:
Profile.objects.create(user=instance, slug=instance.username) profile = Profile.objects.create(user=instance, slug=instance.username)
if not Model.is_external(instance) and settings.JABBER_DEFAULT_HOST:
profile.jabberID = '{}@{}'.format(instance.username, settings.JABBER_DEFAULT_HOST)
profile.save()
else: else:
try: try:
instance.profile.slug = instance.username instance.profile.slug = instance.username
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment