remove phone numbers from user strings

diff --git a/panikdb/aa/models.py b/panikdb/aa/models.py
index 21e6d5d12e79450821f0b2b7ed5006302efbc96b..a3214a5558e745adf4c1ef883ff99bee9e04e97c 100644 (file)
--- a/panikdb/aa/models.py
+++ b/panikdb/aa/models.py
@@ -7,12 +7,14 @@ from django.utils.translation import ugettext_lazy as _
 
 from emissions.models import Emission, Episode, NewsItem, NewsCategory, SoundFile
 
 
 from emissions.models import Emission, Episode, NewsItem, NewsCategory, SoundFile
 

+

 class User(AbstractUser):
     emissions = models.ManyToManyField(Emission, blank=True)
     news_categories = models.ManyToManyField(NewsCategory, blank=True)
 
     phone = models.CharField(_('Phone'), max_length=20, null=True, blank=True)
     mobile = models.CharField(_('Mobile'), max_length=20, null=True, blank=True)
 class User(AbstractUser):
     emissions = models.ManyToManyField(Emission, blank=True)
     news_categories = models.ManyToManyField(NewsCategory, blank=True)
 
     phone = models.CharField(_('Phone'), max_length=20, null=True, blank=True)
     mobile = models.CharField(_('Mobile'), max_length=20, null=True, blank=True)

+    share_contact_details = models.BooleanField(_('Share contact detais'), default=True)

 
     class Meta:
         ordering = ['first_name', 'last_name']
 
     class Meta:
         ordering = ['first_name', 'last_name']


@@ -39,8 +41,4 @@ class User(AbstractUser):
             parts.append(self.last_name)
         if parts:
             s = ' '.join(parts)
             parts.append(self.last_name)
         if parts:
             s = ' '.join(parts)

-        if self.mobile:
-            return '%s (%s)' % (s, self.mobile)
-        if self.phone:
-            return '%s (%s)' % (s, self.phone)

         return s
         return s