Merge branch 'dev' into 'master'

Dev

See merge request !308
master
Andrey 8 years ago
commit 9495dcfcf0
  1. 5
      access/models/other.py

@ -54,8 +54,11 @@ class Account(models.Model):
return self.owner.email return self.owner.email
def get_phone(self): def get_phone(self):
return '' if self.phone is None else ('' if self.phone.national_number else \ try:
return '' if self.phone is None else ('' if self.phone.national_number else \
(self.phone.national_number if self.phone.country_code is None else str(self.phone))) (self.phone.national_number if self.phone.country_code is None else str(self.phone)))
except AttributeError:
return self.phone
class Meta: class Meta:
verbose_name = 'Дополнительная информация о пользователе' verbose_name = 'Дополнительная информация о пользователе'

Loading…
Cancel
Save