Merge branch 'master' of github.com:Gluejar/regluit into goodreads

pull/1/head
Raymond Yee 2011-10-24 18:53:23 -07:00
commit 7c645886bd
2 changed files with 6 additions and 8 deletions

View File

@ -16,17 +16,19 @@ def facebook_extra_values(sender, user, response, details, **kwargs):
pre_update.connect(facebook_extra_values, sender=FacebookBackend)
def create_wishlist(sender, created, instance, **kwargs):
def create_user_objects(sender, created, instance, **kwargs):
# use get_model to avoid circular import problem with models
try:
Wishlist = get_model('core', 'Wishlist')
UserProfile = get_model('core', 'UserProfile')
if created:
Wishlist.objects.create(user=instance)
UserProfile.objects.create(user=instance)
except DatabaseError:
# this can happen when creating superuser during syncdb since the
# core_wishlist table doesn't exist yet
return
post_save.connect(create_wishlist, sender=User)
post_save.connect(create_user_objects, sender=User)
post_save.connect(create_api_key, sender=User)

View File

@ -79,11 +79,7 @@ def supporter(request, supporter_username):
# following block to support profile admin form in supporter page
if request.user.is_authenticated() and request.user.username == supporter_username:
if request.method == 'POST':
try:
profile_obj=request.user.get_profile()
except ObjectDoesNotExist:
profile_obj= models.UserProfile()
profile_obj.user=request.user
profile_obj=request.user.get_profile()
profile_form = ProfileForm(data=request.POST,instance=profile_obj)
if profile_form.is_valid():
profile_form.save()