Revision e066eedb
| b/snf-astakos-app/astakos/im/activation_backends.py | ||
|---|---|---|
| 35 | 35 |
from django.core.exceptions import ImproperlyConfigured |
| 36 | 36 |
from django.utils.translation import ugettext as _ |
| 37 | 37 |
|
| 38 |
from astakos.im.models import AstakosUser
|
|
| 38 |
from astakos.im import models
|
|
| 39 | 39 |
from astakos.im import functions |
| 40 | 40 |
from astakos.im import settings |
| 41 | 41 |
from astakos.im import forms |
| ... | ... | |
| 444 | 444 |
initial_data = None |
| 445 | 445 |
if request.method == 'GET': |
| 446 | 446 |
if invitation: |
| 447 |
# create a tmp user with the invitation realname |
|
| 448 |
# to extract first and last name |
|
| 449 |
u = AstakosUser(realname=invitation.realname) |
|
| 447 |
first, last = models.split_realname(invitation.realname) |
|
| 450 | 448 |
initial_data = {'email': invitation.username,
|
| 451 | 449 |
'inviter': invitation.inviter.realname, |
| 452 |
'first_name': u.first_name,
|
|
| 453 |
'last_name': u.last_name,
|
|
| 450 |
'first_name': first,
|
|
| 451 |
'last_name': last,
|
|
| 454 | 452 |
'provider': provider} |
| 455 | 453 |
else: |
| 456 | 454 |
if provider == request.POST.get('provider', ''):
|
| b/snf-astakos-app/astakos/im/models.py | ||
|---|---|---|
| 303 | 303 |
return _RESOURCE_NAMES |
| 304 | 304 |
|
| 305 | 305 |
|
| 306 |
def split_realname(value): |
|
| 307 |
parts = value.split(' ')
|
|
| 308 |
if len(parts) == 2: |
|
| 309 |
return parts |
|
| 310 |
else: |
|
| 311 |
return ('', value)
|
|
| 312 |
|
|
| 313 |
|
|
| 306 | 314 |
class AstakosUserManager(UserManager): |
| 307 | 315 |
|
| 308 | 316 |
def get_auth_provider_user(self, provider, **kwargs): |
| ... | ... | |
| 476 | 484 |
|
| 477 | 485 |
@realname.setter |
| 478 | 486 |
def realname(self, value): |
| 479 |
parts = value.split(' ')
|
|
| 480 |
if len(parts) == 2: |
|
| 481 |
self.first_name = parts[0] |
|
| 482 |
self.last_name = parts[1] |
|
| 483 |
else: |
|
| 484 |
self.last_name = parts[0] |
|
| 487 |
first, last = split_realname(value) |
|
| 488 |
self.first_name = first |
|
| 489 |
self.last_name = last |
|
| 485 | 490 |
|
| 486 | 491 |
def add_permission(self, pname): |
| 487 | 492 |
if self.has_perm(pname): |
| ... | ... | |
| 1199 | 1204 |
|
| 1200 | 1205 |
@realname.setter |
| 1201 | 1206 |
def realname(self, value): |
| 1202 |
parts = value.split(' ')
|
|
| 1203 |
if len(parts) == 2: |
|
| 1204 |
self.first_name = parts[0] |
|
| 1205 |
self.last_name = parts[1] |
|
| 1206 |
else: |
|
| 1207 |
self.last_name = parts[0] |
|
| 1207 |
first, last = split_realname(value) |
|
| 1208 |
self.first_name = first |
|
| 1209 |
self.last_name = last |
|
| 1208 | 1210 |
|
| 1209 | 1211 |
def save(self, *args, **kwargs): |
| 1210 | 1212 |
if not self.id: |
Also available in: Unified diff