diff --git a/avatar/views.py b/avatar/views.py index c5b9bbb..1d06be6 100644 --- a/avatar/views.py +++ b/avatar/views.py @@ -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(