aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/templates
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2011-12-24 00:08:28 +0100
committerElrond <elrond+mediagoblin.org@samba-tng.org>2011-12-27 20:41:31 +0100
commit05751758469a03835975dd2998aa727fa29c9a16 (patch)
treef101ef46aa0d6441232335f678415ad1555b7f45 /mediagoblin/templates
parent0eb649ff7ac3f1eb71eb1d2cb66019a860b2c5c7 (diff)
downloadmediagoblin-05751758469a03835975dd2998aa727fa29c9a16.tar.lz
mediagoblin-05751758469a03835975dd2998aa727fa29c9a16.tar.xz
mediagoblin-05751758469a03835975dd2998aa727fa29c9a16.zip
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.
Diffstat (limited to 'mediagoblin/templates')
-rw-r--r--mediagoblin/templates/mediagoblin/edit/attachments.html2
-rw-r--r--mediagoblin/templates/mediagoblin/edit/edit.html2
-rw-r--r--mediagoblin/templates/mediagoblin/user_pages/media.html14
-rw-r--r--mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html2
4 files changed, 10 insertions, 10 deletions
diff --git a/mediagoblin/templates/mediagoblin/edit/attachments.html b/mediagoblin/templates/mediagoblin/edit/attachments.html
index 6a5ab896..124d0313 100644
--- 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 aa46af3d..2dfaddc8 100644
--- 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 77461983..13fa1baa 100644
--- 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 7c7218ae..6c483769 100644
--- 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">