Revision 0eb1f53a snf-astakos-app/astakos/im/forms.py
b/snf-astakos-app/astakos/im/forms.py | ||
---|---|---|
185 | 185 |
user.add_auth_provider('local', auth_backend='astakos') |
186 | 186 |
user.set_password(self.cleaned_data['password1']) |
187 | 187 |
|
188 |
def save(self, commit=True, *args, **kwargs):
|
|
188 |
def save(self, commit=True, **kwargs): |
|
189 | 189 |
""" |
190 | 190 |
Saves the email, first_name and last_name properties, after the normal |
191 | 191 |
save behavior is complete. |
192 | 192 |
""" |
193 |
user = super(LocalUserCreationForm, self).save(commit=False, |
|
194 |
*args, **kwargs) |
|
193 |
user = super(LocalUserCreationForm, self).save(commit=False, **kwargs) |
|
195 | 194 |
user.date_signed_terms = datetime.now() |
196 | 195 |
user.renew_token() |
197 | 196 |
if commit: |
198 |
user.save(*args, **kwargs)
|
|
197 |
user.save(**kwargs) |
|
199 | 198 |
logger.info('Created user %s', user.log_display) |
200 | 199 |
return user |
201 | 200 |
|
... | ... | |
219 | 218 |
for f in ro: |
220 | 219 |
self.fields[f].widget.attrs['readonly'] = True |
221 | 220 |
|
222 |
def save(self, commit=True, *args, **kwargs):
|
|
221 |
def save(self, commit=True, **kwargs): |
|
223 | 222 |
user = super(InvitedLocalUserCreationForm, self).save(commit=False, |
224 |
*args, **kwargs)
|
|
223 |
**kwargs) |
|
225 | 224 |
user.set_invitations_level() |
226 | 225 |
user.email_verified = True |
227 | 226 |
if commit: |
228 |
user.save(*args, **kwargs)
|
|
227 |
user.save(**kwargs) |
|
229 | 228 |
return user |
230 | 229 |
|
231 | 230 |
|
... | ... | |
299 | 298 |
provider.add_to_user() |
300 | 299 |
pending.delete() |
301 | 300 |
|
302 |
def save(self, commit=True, *args, **kwargs):
|
|
301 |
def save(self, commit=True, **kwargs): |
|
303 | 302 |
user = super(ThirdPartyUserCreationForm, self).save(commit=False, |
304 |
*args, **kwargs)
|
|
303 |
**kwargs) |
|
305 | 304 |
user.set_unusable_password() |
306 | 305 |
user.renew_token() |
307 | 306 |
user.date_signed_terms = datetime.now() |
308 | 307 |
if commit: |
309 |
user.save(*args, **kwargs)
|
|
308 |
user.save(**kwargs) |
|
310 | 309 |
logger.info('Created user %s' % user.log_display) |
311 | 310 |
return user |
312 | 311 |
|
... | ... | |
327 | 326 |
for f in ro: |
328 | 327 |
self.fields[f].widget.attrs['readonly'] = True |
329 | 328 |
|
330 |
def save(self, commit=True, *args, **kwargs):
|
|
331 |
user = super(InvitedThirdPartyUserCreationForm, self).save( |
|
332 |
commit=False, *args, **kwargs)
|
|
329 |
def save(self, commit=True, **kwargs): |
|
330 |
user = super(InvitedThirdPartyUserCreationForm, self).save(commit=False,
|
|
331 |
**kwargs)
|
|
333 | 332 |
user.set_invitation_level() |
334 | 333 |
user.email_verified = True |
335 | 334 |
if commit: |
336 |
user.save(*args, **kwargs)
|
|
335 |
user.save(**kwargs) |
|
337 | 336 |
return user |
338 | 337 |
|
339 | 338 |
|
... | ... | |
459 | 458 |
def clean_email(self): |
460 | 459 |
return self.instance.email |
461 | 460 |
|
462 |
def save(self, commit=True, *args, **kwargs):
|
|
463 |
user = super(ProfileForm, self).save(commit=False, *args, **kwargs)
|
|
461 |
def save(self, commit=True, **kwargs): |
|
462 |
user = super(ProfileForm, self).save(commit=False, **kwargs) |
|
464 | 463 |
user.is_verified = True |
465 | 464 |
if self.cleaned_data.get('renew'): |
466 | 465 |
user.renew_token( |
... | ... | |
468 | 467 |
current_key=self.session_key |
469 | 468 |
) |
470 | 469 |
if commit: |
471 |
user.save(*args, **kwargs)
|
|
470 |
user.save(**kwargs) |
|
472 | 471 |
return user |
473 | 472 |
|
474 | 473 |
|
... | ... | |
526 | 525 |
def save(self, domain_override=None, |
527 | 526 |
email_template_name='registration/password_reset_email.html', |
528 | 527 |
use_https=False, token_generator=default_token_generator, |
529 |
request=None, *args, **kwargs):
|
|
528 |
request=None, **kwargs): |
|
530 | 529 |
""" |
531 | 530 |
Generates a one-use only link for resetting password |
532 | 531 |
and sends to the user. |
... | ... | |
565 | 564 |
|
566 | 565 |
def save(self, request, |
567 | 566 |
email_template_name='registration/email_change_email.txt', |
568 |
commit=True, *args, **kwargs):
|
|
569 |
ec = super(EmailChangeForm, self).save(commit=False, *args, **kwargs)
|
|
567 |
commit=True, **kwargs): |
|
568 |
ec = super(EmailChangeForm, self).save(commit=False, **kwargs) |
|
570 | 569 |
ec.user = request.user |
571 | 570 |
# delete pending email changes |
572 | 571 |
request.user.emailchanges.all().delete() |
... | ... | |
575 | 574 |
str(random()) + smart_str(ec.new_email_address)) |
576 | 575 |
ec.activation_key = activation_key.hexdigest() |
577 | 576 |
if commit: |
578 |
ec.save(*args, **kwargs)
|
|
577 |
ec.save(**kwargs) |
|
579 | 578 |
send_change_email(ec, request, email_template_name=email_template_name) |
580 | 579 |
|
581 | 580 |
|
... | ... | |
594 | 593 |
raise forms.ValidationError(_(astakos_messages.SIGN_TERMS)) |
595 | 594 |
return has_signed_terms |
596 | 595 |
|
597 |
def save(self, commit=True, *args, **kwargs):
|
|
598 |
user = super(SignApprovalTermsForm, self).save(commit, *args, **kwargs)
|
|
596 |
def save(self, commit=True, **kwargs): |
|
597 |
user = super(SignApprovalTermsForm, self).save(commit=commit, **kwargs)
|
|
599 | 598 |
user.date_signed_terms = datetime.now() |
600 | 599 |
if commit: |
601 |
user.save(*args, **kwargs)
|
|
600 |
user.save(**kwargs) |
|
602 | 601 |
return user |
603 | 602 |
|
604 | 603 |
|
... | ... | |
637 | 636 |
self.session_key = kwargs.pop('session_key', None) |
638 | 637 |
super(ExtendedPasswordChangeForm, self).__init__(user, *args, **kwargs) |
639 | 638 |
|
640 |
def save(self, commit=True, *args, **kwargs):
|
|
639 |
def save(self, commit=True, **kwargs): |
|
641 | 640 |
try: |
642 | 641 |
if settings.NEWPASSWD_INVALIDATE_TOKEN or \ |
643 | 642 |
self.cleaned_data.get('renew'): |
... | ... | |
647 | 646 |
# if user model does has not such methods |
648 | 647 |
pass |
649 | 648 |
return super(ExtendedPasswordChangeForm, self).save(commit=commit, |
650 |
*args, **kwargs)
|
|
649 |
**kwargs) |
|
651 | 650 |
|
652 | 651 |
class ExtendedSetPasswordForm(SetPasswordForm): |
653 | 652 |
""" |
... | ... | |
665 | 664 |
super(ExtendedSetPasswordForm, self).__init__(user, *args, **kwargs) |
666 | 665 |
|
667 | 666 |
@transaction.commit_on_success() |
668 |
def save(self, commit=True, *args, **kwargs):
|
|
667 |
def save(self, commit=True, **kwargs): |
|
669 | 668 |
try: |
670 | 669 |
self.user = AstakosUser.objects.get(id=self.user.id) |
671 | 670 |
if settings.NEWPASSWD_INVALIDATE_TOKEN or \ |
... | ... | |
679 | 678 |
except BaseException, e: |
680 | 679 |
logger.exception(e) |
681 | 680 |
return super(ExtendedSetPasswordForm, self).save(commit=commit, |
682 |
*args, **kwargs)
|
|
681 |
**kwargs) |
|
683 | 682 |
|
684 | 683 |
|
685 | 684 |
|
... | ... | |
905 | 904 |
def cleaned_resource_policies(self): |
906 | 905 |
return [(d['name'], d['uplimit']) for d in self.resource_policies] |
907 | 906 |
|
908 |
def save(self, commit=True, *args, **kwargs):
|
|
907 |
def save(self, commit=True, **kwargs): |
|
909 | 908 |
data = dict(self.cleaned_data) |
910 | 909 |
data['precursor_id'] = self.instance.id |
911 | 910 |
is_new = self.instance.id is None |
Also available in: Unified diff