Revision c4b1a172 snf-astakos-app/astakos/im/target/twitter.py
| b/snf-astakos-app/astakos/im/target/twitter.py | ||
|---|---|---|
| 149 | 149 |
user, |
| 150 | 150 |
request.GET.get('next'),
|
| 151 | 151 |
'renew' in request.GET) |
| 152 |
elif not user.activation_sent or not user.email_verified: |
|
| 153 |
message = _('Your request is pending activation')
|
|
| 154 |
#TODO: use astakos_messages |
|
| 155 |
if not settings.MODERATION_ENABLED: |
|
| 156 |
url = user.get_resend_activation_url() |
|
| 157 |
msg_extra = _('<a href="%s">Resend activation email?</a>') % url
|
|
| 158 |
message = message + u' ' + msg_extra |
|
| 159 |
|
|
| 160 |
messages.error(request, message) |
|
| 161 |
return HttpResponseRedirect(reverse('login'))
|
|
| 162 |
|
|
| 163 | 152 |
else: |
| 164 |
#TODO: use astakos_messages |
|
| 165 |
message = _(u'Account disabled. Please contact support') |
|
| 153 |
message = user.get_inactive_message() |
|
| 166 | 154 |
messages.error(request, message) |
| 167 | 155 |
return HttpResponseRedirect(reverse('login'))
|
| 168 | 156 |
|
| 169 | 157 |
except AstakosUser.DoesNotExist, e: |
| 170 |
#TODO: use astakos_messages |
|
| 171 | 158 |
provider = auth_providers.get_provider('twitter')
|
| 172 | 159 |
if not provider.is_available_for_create(): |
| 160 |
messages.error(request, |
|
| 161 |
_(astakos_messages.AUTH_PROVIDER_NOT_ACTIVE) % provider.get_title_display) |
|
| 173 | 162 |
return HttpResponseRedirect(reverse('login'))
|
| 174 | 163 |
|
| 175 | 164 |
# eppn not stored in astakos models, create pending profile |
Also available in: Unified diff