diff options
author | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-12-12 18:53:03 +0100 |
---|---|---|
committer | Elrond <elrond+mediagoblin.org@samba-tng.org> | 2011-12-12 18:53:03 +0100 |
commit | d44140a212fddab3301cbf3a97d3197f8879277b (patch) | |
tree | edc8f09b0e476fc78472b469fdda6adda33b4dc2 /mediagoblin/listings | |
parent | 6ae878e730e006ab674f12c581af8447a0994a9f (diff) | |
parent | ddc1cae9ea4c80415557ec0408a56a3a1c60423b (diff) | |
download | mediagoblin-d44140a212fddab3301cbf3a97d3197f8879277b.tar.lz mediagoblin-d44140a212fddab3301cbf3a97d3197f8879277b.tar.xz mediagoblin-d44140a212fddab3301cbf3a97d3197f8879277b.zip |
Merge branch 'sql/dot-notation'
* sql/dot-notation:
Dot-Notation for MediaEntry.media_data
Dot-Notation for MediaEntry.media_type
Dot-Notation for MediaEntry.description(_html)
Dot-Notation for MediaEntry.slug
Dot-Notation for MediaEntry.title
Dot-Notation for MediaEntry.uploader
Dot-Notation for MediaEntry.created
Dot-Notation: tests/test_edit.py
Dot-Notation for Users.fp_token_expire
Dot-Notation for Users.fp_verification_key
Dot-Notation for Users.bio and .bio_html
Dot-Notation for Users.url
Dot-Notation for Users.is_admin
Dot-Notation for Users.verification_key
Dot-Notation for Users.status
Dot-Notation for Users.email_verified
Dot-Notation for Users.pw_hash
Dot-Notation for Users.email
Dot-Notation for Users.username
Diffstat (limited to 'mediagoblin/listings')
-rw-r--r-- | mediagoblin/listings/views.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/listings/views.py b/mediagoblin/listings/views.py index 5a09de43..6b83ffcf 100644 --- 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)) |