Turn media.get_uploader into a property

sqlalchemy gives autoloading (hopefully caching) link to
other objects as properties. So turn get_uploader on the
current mongo based stuff into a property to ease
transition.

diff --git a/mediagoblin/db/mongo/models.py b/mediagoblin/db/mongo/models.py
index 8cd0da1b40e52f1de8f22756df989d8d6acba519..5de59c120ce165fab9fba025ae0f25b792a03a4d 100644 (file)
--- a/mediagoblin/db/mongo/models.py
+++ b/mediagoblin/db/mongo/models.py
@@ -261,7 +261,7 @@ class MediaEntry(Document):
 
         Use a slug if we have one, else use our '_id'.
         """
-        uploader = self.get_uploader()
+        uploader = self.get_uploader
 
         if self.get('slug'):
             return urlgen(
@@ -297,6 +297,7 @@ class MediaEntry(Document):
         for media in cursor:
             return media.url_for_self(urlgen)
 
+    @property
     def get_uploader(self):
         return self.db.User.find_one({'_id': self.uploader})
 

diff --git a/mediagoblin/listings/views.py b/mediagoblin/listings/views.py
index 6b83ffcf98439859e2693d0654de52623c2adf09..3ecf06f404809b6bce53f1b4619fb30a188996c9 100644 (file)
--- a/mediagoblin/listings/views.py
+++ b/mediagoblin/listings/views.py
@@ -86,7 +86,7 @@ def tag_atom_feed(request):
         feed.add(entry.get('title'),
             entry.get('description_html'),
             content_type='html',
-            author=entry.get_uploader().username,
+            author=entry.get_uploader.username,
             updated=entry.get('created'),
             url=entry.url_for_self(request.urlgen))
 

diff --git a/mediagoblin/templates/mediagoblin/edit/attachments.html b/mediagoblin/templates/mediagoblin/edit/attachments.html
index 6a5ab8961fe8c130f83055d2cb23bfeaee058c04..124d03138681b91986204cd6bab737433682b8e1 100644 (file)
--- a/mediagoblin/templates/mediagoblin/edit/attachments.html
+++ b/mediagoblin/templates/mediagoblin/edit/attachments.html
@@ -20,7 +20,7 @@
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 {% block mediagoblin_content %}
   <form action="{{ request.urlgen('mediagoblin.edit.attachments',
-                               user= media.get_uploader().username,
+                               user= media.get_uploader.username,
                                media= media._id) }}"
         method="POST" enctype="multipart/form-data">
     <div class="grid_8 prefix_1 suffix_1 edit_box form_box">

diff --git a/mediagoblin/templates/mediagoblin/edit/edit.html b/mediagoblin/templates/mediagoblin/edit/edit.html
index aa46af3d17ba9615ff3e0c358a572032ffbd6f20..2dfaddc8cc86ca1ff59e7c8a7383b46f0e4c0f14 100644 (file)
--- a/mediagoblin/templates/mediagoblin/edit/edit.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit.html
@@ -22,7 +22,7 @@
 {% block mediagoblin_content %}
 
   <form action="{{ request.urlgen('mediagoblin.edit.edit_media',
-                               user= media.get_uploader().username,
+                               user= media.get_uploader.username,
                                media= media._id) }}"
         method="POST" enctype="multipart/form-data">
     <div class="grid_8 prefix_1 suffix_1 edit_box form_box">

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 77461983ef30d5286ebe013f9cefb5fd84aac94b..13fa1baa14582fcf86fffbf615aa483c6b2f56f5 100644 (file)
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -72,11 +72,11 @@
       {% if media['uploader'] == request.user._id or 
                                request.user['is_admin'] %}
         {% set edit_url = request.urlgen('mediagoblin.edit.edit_media',
-                                   user= media.get_uploader().username,
+                                   user= media.get_uploader.username,
                                    media= media._id) %}
         <a class="button_action" href="{{ edit_url }}">{% trans %}Edit{% endtrans %}</a>
         {% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete',
-                                   user= media.get_uploader().username,
+                                   user= media.get_uploader.username,
                                    media= media._id) %}
         <a class="button_action" href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a>
       {% endif %}
@@ -95,7 +95,7 @@
     {# 0 comments. Be the first to add one! #}
       {% if request.user %}
         <form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment', 
-                                         user= media.get_uploader().username,
+                                         user= media.get_uploader.username,
                                          media=media._id) }}" method="POST" id="form_comment">
           <p>
             {% trans %}Type your comment here. You can use <a href="http://daringfireball.net/projects/markdown/basics" target="_blank">Markdown</a> for formatting.{% endtrans %}
@@ -128,7 +128,7 @@
                   {% trans %}at{% endtrans %} 
                   <a href="{{ request.urlgen('mediagoblin.user_pages.media_home.view_comment',
                          comment = comment._id,
-                         user = media.get_uploader().username,
+                         user = media.get_uploader.username,
                          media = media.slug) }}#comment">
                     {{ comment.created.strftime("%I:%M%p %Y-%m-%d") }}
                   </a>
@@ -142,8 +142,8 @@
   <div class="grid_5 omega">
     {% trans user_url=request.urlgen(
                 'mediagoblin.user_pages.user_home',
-                user=media.get_uploader().username),
-                username=media.get_uploader().username -%}
+                user=media.get_uploader.username),
+                username=media.get_uploader.username -%}
       <p>❖ Browsing media by <a href="{{ user_url }}">{{ username }}</a></p>
     {%- endtrans %}  
     {% include "mediagoblin/utils/prev_next.html" %}
@@ -164,7 +164,7 @@
                or request.user.is_admin) %}
       <p>
         <a href="{{ request.urlgen('mediagoblin.edit.attachments',
-                      user=media.get_uploader().username,
+                      user=media.get_uploader.username,
                       media=media._id) }}">Add attachment</a>
       </p>
     {% endif %}

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
index 7c7218ae8515b6a1df7f5471d0ab10b640729421..6c483769139cedd94e794582a4b245f84c5b8da5 100644 (file)
--- a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
@@ -22,7 +22,7 @@
 {% block mediagoblin_content %}
 
   <form action="{{ request.urlgen('mediagoblin.user_pages.media_confirm_delete',
-                                 user=media.get_uploader().username,
+                                 user=media.get_uploader.username,
                                  media=media._id) }}"
         method="POST" enctype="multipart/form-data">
     <div class="grid_8 prefix_1 suffix_1 edit_box form_box">

diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index 449e3b1c4e4230dbd2293a264dc718f6ea8a4c7e..f721f012bce01e68c345a673f458618828341e21 100644 (file)
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -173,7 +173,7 @@ def media_confirm_delete(request, media):
 
     if request.method == 'POST' and form.validate():
         if form.confirm.data is True:
-            username = media.get_uploader().username
+            username = media.get_uploader.username
 
             # Delete all files on the public storage
             delete_media_files(media)