Revision c4b1a172 snf-astakos-app/astakos/im/forms.py
| b/snf-astakos-app/astakos/im/forms.py | ||
|---|---|---|
| 65 | 65 |
from astakos.im.functions import send_change_email |
| 66 | 66 |
|
| 67 | 67 |
from astakos.im.util import reserved_email, get_query |
| 68 |
from astakos.im import auth_providers |
|
| 68 | 69 |
|
| 69 | 70 |
import astakos.im.messages as astakos_messages |
| 70 | 71 |
|
| ... | ... | |
| 382 | 383 |
""" |
| 383 | 384 |
Override default behavior in order to check user's activation later |
| 384 | 385 |
""" |
| 386 |
username = self.cleaned_data.get('username')
|
|
| 387 |
|
|
| 388 |
try: |
|
| 389 |
user = AstakosUser.objects.get(email=username) |
|
| 390 |
if not user.has_auth_provider('local'):
|
|
| 391 |
provider = auth_providers.get_provider('local')
|
|
| 392 |
raise forms.ValidationError( |
|
| 393 |
_(provider.get_message('NOT_ACTIVE_FOR_USER_LOGIN')))
|
|
| 394 |
except AstakosUser.DoesNotExist: |
|
| 395 |
pass |
|
| 396 |
|
|
| 385 | 397 |
try: |
| 386 | 398 |
super(LoginForm, self).clean() |
| 387 | 399 |
except forms.ValidationError, e: |
| 388 |
# if self.user_cache is None: |
|
| 389 |
# raise |
|
| 400 |
if self.user_cache is None: |
|
| 401 |
raise |
|
| 402 |
if not self.user_cache.is_active: |
|
| 403 |
raise forms.ValidationError(self.user_cache.get_inactive_message()) |
|
| 390 | 404 |
if self.request: |
| 391 | 405 |
if not self.request.session.test_cookie_worked(): |
| 392 | 406 |
raise |
Also available in: Unified diff