From b43bfc39d817bfb4e4f345e6717c90ba0e2bdb0a Mon Sep 17 00:00:00 2001
From: Fabien Quatravaux <fabien.quatravaux@riseup.net>
Date: Wed, 10 Jun 2020 17:46:54 +0200
Subject: [PATCH] update: move jabberID field from account.chat_profile to
profile
---
djangoldp_profile/models.py | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/djangoldp_profile/models.py b/djangoldp_profile/models.py
index 9019d9e..1956dd4 100644
--- a/djangoldp_profile/models.py
+++ b/djangoldp_profile/models.py
@@ -64,12 +64,7 @@ class Profile(Model):
website = models.URLField(blank=True)
address = models.ForeignKey(Address, on_delete=models.CASCADE, related_name="profile", blank=True, null=True)
skills = models.ManyToManyField(Skill, blank=True)
-
- def jabberID(self):
- try:
- return self.user.chatProfile.jabberID
- except:
- return None
+ jabberID = models.CharField(max_length=255, blank=True, null=True)
def name(self):
try:
@@ -125,7 +120,10 @@ class Profile(Model):
@receiver(post_save, sender=settings.AUTH_USER_MODEL)
def create_user_profile(sender, instance, created, **kwargs):
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:
try:
instance.profile.slug = instance.username
--
GitLab