Merge pull request #807 from Gluejar/fix-ml-subscribe

corrected test for social_auth
pull/95/head
eshellman 2018-08-15 15:38:17 -04:00 committed by GitHub
commit fb6f9ec9e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -49,7 +49,7 @@ def create_user_objects(sender, created, instance, **kwargs):
if created: if created:
Wishlist.objects.create(user=instance) Wishlist.objects.create(user=instance)
profile = UserProfile.objects.create(user=instance) profile = UserProfile.objects.create(user=instance)
if hasattr(instance, 'social_auth'): if instance.social_auth.exists():
instance.profile.ml_subscribe() instance.profile.ml_subscribe()
except DatabaseError: except DatabaseError:
# this can happen when creating superuser during syncdb since the # this can happen when creating superuser during syncdb since the

View File

@ -6,7 +6,7 @@
{% if not user.is_authenticated %} {% if not user.is_authenticated %}
<p> <p>
An account activation email has been sent. Please check your email and click on the link to activate your account. We're also sending you an invitation to our email newsletter. It comes out about twice a month. Put "unglueit@ebookfoundation.org" in your contact list to make sure you get it. An account activation email has been sent. Please check your email and click on the link to activate your account. We'll also send you an invitation to our email newsletter. It is infrequent. Put "unglueit@ebookfoundation.org" in your contact list to make sure you get it.
</p> </p>
{% if request.COOKIES.next %} {% if request.COOKIES.next %}