Cachebust my own picture, fix bug 690513

apps/phonebook/helpers.py

@@ -1,7 +1,24 @@
+import time
+
+import jinja2
+from funfactory.urlresolvers import reverse
 from jingo import register
 
 
 @register.filter
 def vouched(user):
     if hasattr(user, 'is_vouched'):
         return user.is_vouched()
+
+
+@register.inclusion_tag('phonebook/includes/photo.html')
+@jinja2.contextfunction
+def profile_photo(context, person):
+    user = context['request'].user
+    me = bool(user.username == person.username)
+    url = reverse('phonebook.profile_photo', args=[person.unique_id])
+
+    if me:
+        url += '?%d' % int(time.time())
+
+    return dict(image_url=url)

apps/phonebook/templates/phonebook/includes/photo.html

@@ -0,0 +1,2 @@
+<img class="photo u-photo"src="{{ image_url }}" id="profile-photo"
+     alt="{{ _('Profile photo') }}">

apps/phonebook/templates/phonebook/profile.html

@@ -56,8 +56,7 @@ <h1>
   <div class="clear"></div>
 
   <div class="blue-pastels vcard h-card">
-    <img class="photo u-photo" src="{{ url('phonebook.profile_photo', person.unique_id) }}"
-      id="profile-photo" alt="{{ _('Profile photo') }}">
+    {{ profile_photo(person) }}
 
     {% if user.username == person.username %}
       <a href="{{ url('phonebook.edit_profile', person.unique_id) }}"

apps/phonebook/tests/test_views.py

@@ -218,6 +218,13 @@ def test_pending_edit_profile(self):
         r = newbie_client.post(delete_url, data, follow=True)
         eq_(200, r.status_code, 'A Mozillian can delete their own account')
 
+    def test_my_profile(self):
+        """Are we cachebusting our picture?"""
+        profile = reverse('profile', args=[MOZILLIAN['uniq_id']])
+        r = self.mozillian_client.get(profile)
+        doc = pq(r.content)
+        assert '?' in doc('#profile-photo').attr('src')
+
 
 def _logged_in_html(response):
     doc = pq(response.content)

apps/phonebook/views.py

@@ -8,7 +8,6 @@
                          HttpResponseForbidden)
 from django.shortcuts import redirect, render
 from django.views.decorators.cache import never_cache
-from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_POST
 
 import jingo
@@ -99,11 +98,9 @@ def _profile(request, person, use_master):
         person.irc_nickname = services[MOZILLA_IRC_SERVICE_URI]
         del services[MOZILLA_IRC_SERVICE_URI]
 
-    return jingo.render(request, 'phonebook/profile.html',
-                        dict(absolutify=absolutify,
-                             person=person,
-                             vouch_form=vouch_form,
-                             services=services))
+    data = dict(absolutify=absolutify, person=person, vouch_form=vouch_form,
+                services=services)
+    return jingo.render(request, 'phonebook/profile.html', data)
 
 
 @never_cache