diff options
| author | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-12-18 22:52:49 +0100 |
|---|---|---|
| committer | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-12-23 22:25:06 +0100 |
| commit | fb7dd855de987d4e3dded1e55cad09a9fe6120cc (patch) | |
| tree | ab48597b02549b29aad8d1a69fdf4782e365b35e | |
| parent | db425022ddcb23ad69b8ba09e7280eb699ba4a4f (diff) | |
| download | mediagoblin-fb7dd855de987d4e3dded1e55cad09a9fe6120cc.tar.lz mediagoblin-fb7dd855de987d4e3dded1e55cad09a9fe6120cc.tar.xz mediagoblin-fb7dd855de987d4e3dded1e55cad09a9fe6120cc.zip | |
Turn MediaComment's author() into get_author property
1) MediaComment's author method conflicts with the author
field. So rename it to get_author.
2) Turn it from a normal function into a python property.
That means you call it by ".get_author" not by
".get_author()". This is exactly what sqlalchemy gives
us free of charge.
| -rw-r--r-- | mediagoblin/db/mongo/models.py | 3 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mediagoblin/db/mongo/models.py b/mediagoblin/db/mongo/models.py index e2ac1b5a..0e31fc1c 100644 --- a/mediagoblin/db/mongo/models.py +++ b/mediagoblin/db/mongo/models.py @@ -346,7 +346,8 @@ class MediaComment(Document): def media_entry(self): return self.db.MediaEntry.find_one({'_id': self['media_entry']}) - def author(self): + @property + def get_author(self): return self.db.User.find_one({'_id': self['author']}) diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index b9e31667..c171dd5a 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -109,7 +109,7 @@ {% endif %} {% if comments %} {% for comment in comments %} - {% set comment_author = comment.author() %} + {% set comment_author = comment.get_author %} {% if pagination.active_id == comment._id %} <div class="comment_wrapper comment_active" id="comment-{{ comment._id }}"> <a name="comment" id="comment"></a> |