Ticket #159: verify_email-fix_user_gallery_url.patch

mediagoblin/db/models.py

@@ -66 +66 @@
         return auth_lib.bcrypt_check_password(
             password, self['pw_hash'])
 
+    def url_to_gallery(self, urlgen):
+        """
+        Get the gallery URL for this user
+        """
+        return urlgen(
+            'mediagoblin.user_pages.user_gallery',
+            user=self['username'])
+
 
 class MediaEntry(Document):
     __collection__ = 'media_entries'

mediagoblin/templates/mediagoblin/user_pages/user.html

@@ -35 +35 @@
      {% endif %}
    </div>
    <div class="grid_10 omega">
-     {% set pagination_base_url = user_gallery_url %}
+     {% set pagination_base_url = user.url_to_gallery(request.urlgen) %}
      {% include "mediagoblin/utils/object_gallery.html" %}
      <div class="clear"></div>
-     <p><a href="{{ user_gallery_url }}">View all of {{ user.username }}'s media</a></p>
+     <p><a href="{{ user.url_to_gallery(request.urlgen) }}">View all of {{ user.username }}'s media</a></p>
       <a href={{ request.urlgen(
                      'mediagoblin.user_pages.atom_feed',
                      user=user.username) }}>atom feed</a>

mediagoblin/user_pages/views.py

@@ -47 +47 @@
     #if no data is available, return NotFound
     if media_entries == None:
         return exc.HTTPNotFound()
-    
-    user_gallery_url = request.urlgen(
-        'mediagoblin.user_pages.user_gallery',
-        user=user['username'])
 
     return render_to_response(
         request,
         'mediagoblin/user_pages/user.html',
         {'user': user,
-         'user_gallery_url': user_gallery_url,
          'media_entries': media_entries,
          'pagination': pagination})