Revision 53161dd8 snf-astakos-app/astakos/im/forms.py
b/snf-astakos-app/astakos/im/forms.py | ||
---|---|---|
484 | 484 |
super(ExtendedPasswordChangeForm, self).__init__(user, *args, **kwargs) |
485 | 485 |
|
486 | 486 |
def save(self, commit=True): |
487 |
user = super(ExtendedPasswordChangeForm, self).save(commit=False) |
|
488 | 487 |
if NEWPASSWD_INVALIDATE_TOKEN or self.cleaned_data.get('renew'): |
489 |
user.renew_token() |
|
490 |
if commit: |
|
491 |
user.save() |
|
492 |
return user |
|
488 |
self.user.renew_token() |
|
489 |
return super(ExtendedPasswordChangeForm, self).save(commit=commit) |
|
493 | 490 |
|
494 | 491 |
class ExtendedSetPasswordForm(SetPasswordForm): |
495 | 492 |
""" |
... | ... | |
505 | 502 |
super(ExtendedSetPasswordForm, self).__init__(user, *args, **kwargs) |
506 | 503 |
|
507 | 504 |
def save(self, commit=True): |
508 |
user = super(ExtendedSetPasswordForm, self).save(commit=False) |
|
509 | 505 |
if NEWPASSWD_INVALIDATE_TOKEN or self.cleaned_data.get('renew'): |
510 |
try: |
|
511 |
user = AstakosUser.objects.get(id=user.id) |
|
512 |
except AstakosUser.DoesNotExist: |
|
513 |
pass |
|
514 |
else: |
|
515 |
user.renew_token() |
|
516 |
if commit: |
|
517 |
user.save() |
|
518 |
return user |
|
506 |
if isinstance(self.user, AstakosUser): |
|
507 |
self.user.renew_token() |
|
508 |
return super(ExtendedSetPasswordForm, self).save(commit=commit) |
Also available in: Unified diff