Hopiu/django-avatar
1
0
Fork 0
mirror of https://github.com/jazzband/django-avatar.git synced 2026-03-16 22:20:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Check for django-friends using INSTALLED_APPS to prevent imports from happening

Browse source 
Reported to Pinax as http://code.pinaxproject.com/tasks/task/481/

Signed-off-by: Brian Rosner <brosner@gmail.com>
This commit is contained in:
Jakob Torp Svendsen 2009-10-21 11:45:32 +02:00 committed by Brian Rosner
parent 6b3b770ab8
commit cc158668ea
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
avatar/views.py
View file

@ -17,11 +17,9 @@ try:
except ImproperlyConfigured:
notification = None
try:
from friends.models import Friendship
friends = False
if 'friends' in settings.INSTALLED_APPS:
friends = True
except ImportError:
friends = False
def _get_next(request):
"""
@ -76,7 +74,8 @@ def change(request, extra_context={}, next_override=None):
message=_("Successfully updated your avatar."))
if updated and notification:
notification.send([request.user], "avatar_updated", {"user": request.user, "avatar": avatar})
notification.send((x['friend'] for x in Friendship.objects.friends_for_user(request.user)), "avatar_friend_updated", {"user": request.user, "avatar": avatar})
if friends:
notification.send((x['friend'] for x in Friendship.objects.friends_for_user(request.user)), "avatar_friend_updated", {"user": request.user, "avatar": avatar})
return HttpResponseRedirect(next_override or _get_next(request))
return render_to_response(
'avatar/change.html',
@ -107,7 +106,8 @@ def delete(request, extra_context={}, next_override=None):
a.primary = True
a.save()
notification.send([request.user], "avatar_updated", {"user": request.user, "avatar": a})
notification.send((x['friend'] for x in Friendship.objects.friends_for_user(request.user)), "avatar_friend_updated", {"user": request.user, "avatar": a})
if friends:
notification.send((x['friend'] for x in Friendship.objects.friends_for_user(request.user)), "avatar_friend_updated", {"user": request.user, "avatar": a})
break
Avatar.objects.filter(id__in=ids).delete()
request.user.message_set.create(