fix errors in avatar and upgrade django-avatar to the latest version …

…3.0.0

requirements.txt

@@ -7,7 +7,7 @@ Pillow==3.2.0
 anyjson>=0.2.4
 django-authority>=0.4
 # temp fix - the latest version of django-avatar-3.0.0 breaks profile
-django-avatar==2.2.1
+django-avatar==3.0.0
 django-countries==3.4.1
 django-form-utils>=0.1.8
 django-localflavor==1.3

tendenci/apps/profiles/templates/profiles/change_avatar.html

@@ -28,7 +28,7 @@ <h2>{% trans "User:" %} <a href="{{ user_this.get_absolute_url }}">{{user_this.f
         </form>
     {% endif %}
     <form enctype="multipart/form-data" method="POST" action="">{% csrf_token %}
-        <input type="file" name="avatar" value="{% trans 'Avatar Image' %}" />
+        {{ upload_avatar_form.as_p }}
         <input type="submit" value="{% trans 'Upload New Image' %}" />
     </form>
 </div>

tendenci/apps/profiles/templatetags/profile_tags.py

@@ -3,7 +3,7 @@
 from django.utils.translation import ugettext_lazy as _
 
 from avatar.templatetags.avatar_tags import avatar_url
-from avatar.util import get_default_avatar_url
+from avatar.utils import get_default_avatar_url
 
 
 register = Library()

tendenci/apps/profiles/views.py

@@ -38,8 +38,10 @@
 from tendenci.apps.exports.utils import render_csv
 
 # for avatar
-from avatar.models import Avatar, avatar_file_path
-from avatar.forms import PrimaryAvatarForm
+from avatar.models import Avatar
+from avatar.forms import PrimaryAvatarForm, UploadAvatarForm
+from avatar.utils import invalidate_cache
+from avatar.signals import avatar_updated
 
 # for group memberships
 from tendenci.apps.user_groups.models import GroupMembership, Group
@@ -616,40 +618,37 @@ def change_avatar(request, id, extra_context={}, next_override=None):
     else:
         avatar = None
         kwargs = {}
-    primary_avatar_form = PrimaryAvatarForm(request.POST or None, user=user_edit, **kwargs)
+    upload_avatar_form = UploadAvatarForm(request.POST or None,
+                                          request.FILES or None,
+                                          user=request.user, **kwargs)
+    primary_avatar_form = PrimaryAvatarForm(request.POST or None,
+                                       user=request.user,
+                                       avatars=avatars, **kwargs)
     if request.method == "POST":
         updated = False
-        if 'avatar' in request.FILES:
-            path = avatar_file_path(user=user_edit,
-                filename=request.FILES['avatar'].name)
-            avatar = Avatar(
-                user = user_edit,
-                primary = True,
-                avatar = path,
-            )
-            new_file = avatar.avatar.storage.save(path, request.FILES['avatar'])
-            avatar.save()
-            updated = True
-
-            messages.add_message(
-                request, messages.SUCCESS, _("Successfully uploaded a new avatar."))
-
         if 'choice' in request.POST and primary_avatar_form.is_valid():
-            avatar = Avatar.objects.get(id=
-                primary_avatar_form.cleaned_data['choice'])
+            avatar = Avatar.objects.get(
+                id=primary_avatar_form.cleaned_data['choice'])
             avatar.primary = True
             avatar.save()
             updated = True
-
-            messages.add_message(
-                request, messages.SUCCESS, _("Successfully updated your avatar."))
-
-        if updated and notification:
-            notification.send([request.user], "avatar_updated", {"user": user_edit, "avatar": avatar})
-            #if friends:
-            #    notification.send((x['friend'] for x in Friendship.objects.friends_for_user(user_edit)), "avatar_friend_updated", {"user": user_edit, "avatar": avatar})
-        return HttpResponseRedirect(reverse('profile', args=[user_edit.username]))
-        #return HttpResponseRedirect(next_override or _get_next(request))
+            invalidate_cache(request.user)
+            messages.success(request, _("Successfully updated your avatar."))
+        else:
+            if upload_avatar_form.is_valid():
+                avatar = Avatar(user=request.user, primary=True)
+                image_file = request.FILES['avatar']
+                avatar.avatar.save(image_file.name, image_file)
+                avatar.save()
+                messages.success(request, _("Successfully uploaded a new avatar."))
+                avatar_updated.send(sender=Avatar, user=request.user, avatar=avatar)
+                updated = True
+        if updated:
+            avatar_updated.send(sender=Avatar, user=request.user, avatar=avatar)
+            if notification:
+                notification.send([request.user], "avatar_updated", {"user": user_edit, "avatar": avatar})
+            return redirect(reverse('profile', args=[user_edit.username]))
+
     return render_to_response(
         'profiles/change_avatar.html',
         extra_context,
@@ -658,6 +657,7 @@ def change_avatar(request, id, extra_context={}, next_override=None):
             {'user_this': user_edit,
               'avatar': avatar,
               'avatars': avatars,
+              'upload_avatar_form': upload_avatar_form,
               'primary_avatar_form': primary_avatar_form,
               'next': next_override or _get_next(request), }
         )